Merge "Merge "CompatUI UX Improvements" into tm-qpr-dev am: b3d00601 am:...

Merge "Merge "CompatUI UX Improvements" into tm-qpr-dev am: b3d00601 am: 2526e779" into udc-dev am: 0b253e3c

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



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