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

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



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