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

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



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