Merge "Merge "Empty state UI tweaks" into tm-dev am: ec9b0f94 am:...

Merge "Merge "Empty state UI tweaks" into tm-dev am: ec9b0f94 am: 09693d8b" into tm-d1-dev-plus-aosp am: d5f99e25

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



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