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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 126cf669 -s ours am: fdfb7e85 -s ours am: 6640c621 -s ours" into rvc-d1-dev-plus-aosp am: fb4a1ac7 -s ours am: c5787e39 -s ours

am skip reason: subject contains skip directive

Change-Id: I485ab0fb308838299acebbea6bba32a86293604f