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

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



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