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

am skip reason: subject contains skip directive

Change-Id: Ie9c15809ee09fff7126cf044dc5cd26e8caa69b3
tree: 8133cdd5a77f55fc6f1252122546d7c872273baa
  1. Tethering/