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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b -s ours am: 6fa9eec8 -s ours" into sc-v2-dev-plus-aosp am: f9e287a8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iad56add94a98283b08253c3c6bf5b5bc084d3b2a