Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 5b84d06935
-s ours" into rvc-qpr-dev-plus-aosp am: dba49a339c
-s ours am: 6d9bafb14f
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756 Change-Id: I709e4bcf533ebf3402e7610184fb14b9afbba10c
This commit is contained in: