Merge "Changing the system theme no longer causes a UMO flicker" into tm-dev...

Merge "Changing the system theme no longer causes a UMO flicker" into tm-dev am: fc279777 am: 30a3aed9 am: ddc769c3 am: a6f9a3e0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18392069



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