Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec5 am:...

Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec5 am: 6c2ffc22 am: 447f77c0 am: a64429b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672



Change-Id: I032de9c1b368c7a7c4743fd4695511f063bc0598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>