[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 06cc4df53e  -s ours am: 7720a1578f  -s ours
am: 67bd31c550  -s ours

Change-Id: Id1f04492ff24b97c688c4a82bde795ead67ab22f