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

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



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