[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours am: 8b76cbe82c
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511 Change-Id: Ide1ab0f062dee24a3e0a99ad63c4a5cb4dc01e25
This commit is contained in: