Merge changes from topic "compact-improvements-v3" into tm-dev am: eecef3cf

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



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