Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: d46390f21f
-s ours am: e61a21f4a0
-s ours" into rvc-qpr-dev-plus-aosp am: ef23b94d40
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889176 Change-Id: I516e531e6cc855ea77a4d80e046ba24710216025
This commit is contained in: