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