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: 849dba46 am: bf393a9a

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



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