Merge "Fix string" into udc-dev am: 81ac516705
am: 0b57a35470
am: ec9917069a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199 Change-Id: Ib449a17bb19576f3a17256a175da43b09894eb3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: