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