[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 6e683f824a -s ours
am skip reason: subject contains skip directive

Change-Id: Iab6a8618ec303432c48fff2cafd5eb37069513fb