Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc8 am: 0d6569d1

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



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