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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 05103c79 -s ours am: bf139f4a -s ours" into rvc-d1-dev-plus-aosp am: d1cc88ce -s ours am: 4cb3c84d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id977f6b1b6af5c8cb304a11205339a3076dcc40c