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

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



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