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: c5be5dad am: 5f6ed1cc am: d54ee9a4

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



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