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