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

Change-Id: I3f04e19199cb812b56544a3b4e6962e48de13831