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