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: ef323fed -s ours" into rvc-d1-dev-plus-aosp am: f8575397 -s ours am: 03add0bb -s ours

am skip reason: subject contains skip directive

Change-Id: I19a6b5660216e2fc86c14f8b026571fc839f3a55