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

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



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