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