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: 292467b8" into tm-d1-dev-plus-aosp am: f3c3ecf9

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



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