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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e -s ours am: d98f641f -s ours" into rvc-qpr-dev-plus-aosp am: bac91c4e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I78b6635d570cc36cd9c957e62978ca6f99bd028e