[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3 -s ours am: dda5464180 -s ours am: c17720247e -s ours am: 929bde97a4 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683526 Change-Id: I5f5bddffe57811a64a04e7cc55bdec08209ed041
This commit is contained in: