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

am skip reason: subject contains skip directive

Change-Id: Ib1672eff3412a595a8821f71af247a774238a372
tree: ef129fc3cfa7e06f1b9d27d10e8dfac338ba8438
  1. Tethering/