Merge "Handle uiMode change in CompatUI" into udc-dev am: 19d41263 am:...

Merge "Handle uiMode change in CompatUI" into udc-dev am: 19d41263 am: cf216a7c am: d6c5c770 am: 0a4acacd

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



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