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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 00d15c44 -s ours am: a2e42464 -s ours am: a77bc986 -s ours" into rvc-qpr-dev-plus-aosp am: 6783d895 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I02681e2aba534a8a996f322bf2e2cc8adfb72d32