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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 82b99f14 -s ours am: 83d07425 -s ours" into rvc-d1-dev-plus-aosp am: a1ce22e1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7f8de6f691b9838aaeadc8c7c97a5e81a3eafbe7