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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: b1b49973 -s ours am: 24bb35c1 -s ours am: b447f33c -s ours am: e2372efc -s ours" into rvc-qpr-dev-plus-aosp am: aeaabf84 -s ours

am skip reason: subject contains skip directive

Change-Id: I554c72c05340fd1a51a40261c5fffd2f8718382f