Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e8f08872 -s ours am: 7e606fdf -s ours am: 302a8d7d -s ours" into rvc-d1-dev-plus-aosp am: d633c7d8 -s ours am: fc3c97b1 -s ours

am skip reason: subject contains skip directive

Change-Id: I8ccb60cc21fe856ce9bb7fa2814ad6070919b208