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