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: 980f715c am: fb5e62e7

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



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