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

Merge "Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec5 am: 0d415d7c" into tm-d1-dev-plus-aosp am: 5c1527a9

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



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