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

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



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