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: 45dab5e1 -s ours" into rvc-d1-dev-plus-aosp am: 407a68b2 -s ours am: d35e893c -s ours

am skip reason: subject contains skip directive

Change-Id: I7f9078a0d31436983ff726c4ef6e0a9ec6d74fec