[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb
-s ours am: 70a5bd4c62
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591585 Change-Id: I42d5610e565014cd40e02fdef3fd1742508cbb04
This commit is contained in: