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

Change-Id: I74a96eb2183b2c6006db8c0f53a5e4221ffea88f