Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: e50e40098f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674 Change-Id: I53e4c0209260255342067c9999172a08d42e196a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: