Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca0...

Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca0 -s ours am: 24cc569d -s ours" into rvc-d1-dev-plus-aosp am: 2e00e85c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I578232b7387cb8068e4f20a1ff65a6f1578a13f9