Merge "Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc8 am: f61254af am: 52507eb5" into tm-qpr-dev-plus-aosp am: 429768bf

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



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