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