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

Change-Id: I131c03900e8939eadd6c15f849dd66ea24b4e9dd