[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3
-s ours am: 444c856107
-s ours am: 9a474ea6e4
-s ours am: 983b31be76
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510888 Change-Id: I2f156dc19d650514ad91750a8b773d3b2e6664a1
This commit is contained in: