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

Change-Id: I9aa4b1bff3c045fc2a6a9a6a1f38568c0f5045d4