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

Change-Id: I02d59e4fe2e0a243e234617e3349d73a6ea09d9a