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

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



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