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

Merge "Merge changes from topic "compact-improvements-v2" into tm-dev am: ee628e28 am: 959f2b43" into tm-d1-dev-plus-aosp am: f5e95913

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



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