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