[automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: f90dce2195 -s ours am: 5fdbc69718 -s ours

am skip reason: subject contains skip directive

Change-Id: Id26b79f3095116fa83baf0ea0c51b6b2b1a51be7
tree: c1783c891f45dfb1c1b44050a12c0b02d6a266f8
  1. Tethering/