Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 03b20f86 -s ours am: 482d852d -s ours" into rvc-d1-dev-plus-aosp am: f832fa04 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5b2b7f2bf4de054009ac799e580f5e6fe82337f3