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: f61254af am: 52507eb5

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



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