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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ce1c1d37 -s ours am: c3850287 -s ours am: 34f5e2c0 -s ours" into rvc-qpr-dev-plus-aosp am: f4e887de -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7a3c1d251f0b0c33b4c3a94cf59237d1669048ea