[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-s ours am: 17eccfd048
-s ours am: c6fad452b9
-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: Ibffcbc4c4054a9e1e23023377fba0f1475cd1c0a
This commit is contained in: