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

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



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