[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7890c95d46  -s ours
am: 95be8c4411  -s ours

Change-Id: Ie40449f380705576987fa20088eac63340cfc8e2