Merge "Merge "Style tweaks for resolver empty state." into tm-dev am:...

Merge "Merge "Style tweaks for resolver empty state." into tm-dev am: e46c5081 am: ef16aea5" into tm-d1-dev-plus-aosp am: e53a0408

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



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