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 am: 86efc33c

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



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