Merge changes from topic "compact-improvements-v2" into tm-dev am: ee628e28...

Merge changes from topic "compact-improvements-v2" into tm-dev am: ee628e28 am: b25224e1 am: 7063410a am: 3816f05b

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



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