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