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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ad648cb0 -s ours am: e106452a -s ours am: fab0e10a -s ours" into rvc-d1-dev-plus-aosp am: 75e9440f -s ours

am skip reason: subject contains skip directive

Change-Id: I2847bd8a2c8ac3baa08cde9c4b10855036f2944b