Merge "Update strings for mini-resolver views" into udc-dev am: 829775a6 am:...

Merge "Update strings for mini-resolver views" into udc-dev am: 829775a6 am: 9c4684c4 am: 6f00b410 am: 0c2225bf

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



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