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