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

Change-Id: I8a91db4da2b410c9eb18e2b14f497b33d4538b17