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 am: e78a956f

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



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