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: I6bd92c8c560c3eab74e38f9efd5f3c5cef1621e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>