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

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



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