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