Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 9cdc977bd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672 Change-Id: Iac68b15d5e00df4b33428694753952379ba86e4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: