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

Change-Id: I6e6104973d20293908f09edbb76c43a4c5f436f1