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