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

Change-Id: I41e5a560295149dcea0500a50b07582f9cd1dae8