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

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

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



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