[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 3db4ae0fbd  -s ours

Change-Id: I20a71172cf88b798ede97c1fdfa7f8a51cfe92f3