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

Change-Id: I947b6aa485441d4c504554d7b2b6984685101c65