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 am: 9327ad0d

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



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