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 am: 003ce11e

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



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