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

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



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