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

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

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



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