Merge changes from topic "compact-improvements-v2" into tm-dev am: ee628e28 am: 959f2b43 am: 88c9441d

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



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