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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: af595079 -s ours am: 4624cf1e -s ours am: 4c732731 -s ours" into rvc-qpr-dev-plus-aosp am: b394a42f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4772bf3a285a81acb35d9d13bfc098f877bda21d