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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79 -s ours am: 8215f663 -s ours" into rvc-d1-dev-plus-aosp am: cab87fe7 -s ours am: cf9a2fa4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4eb2e8f1ad14a5f2003bd2a4a1e18f1c771d1f30