Merge "Change strings in resolver switch" into udc-dev am: 2b31afee am: fc21f618

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



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