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