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: c0db9595 am: e95706c1

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



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