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