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

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



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