Merge "Fix incorrect strings in MiniResolver" into udc-dev am: 05492401 am: 5dd7671e am: 1d5bf3f1

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



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