Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d -s ours am: d98f641fca -s ours" into rvc-qpr-dev-plus-aosp am: bac91c4ea3 -s ours am: e5a1c803f7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12202448 Change-Id: I930fb52a8986e48803de0178477d0cbed04a8f91
This commit is contained in: