[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d2a2867d85
-s ours am: 8e18b5b69d
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281572 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa4c9f4eb78b442cbee8ae7f4e7a54b049757970
This commit is contained in: