[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7890c95d46  -s ours am: 95be8c4411  -s ours
am: 44d39af785  -s ours

Change-Id: I9dd50d675a9ecbff50d160365fcbff4e25ec6b79