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

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



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