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

Change-Id: If15f3fcb0f5857b719a7f2c9799d775c6cd2896c