Merge "Fix string" into udc-dev am: 81ac5167 am: 0b57a354

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199



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