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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 46dbb497 -s ours am: bd5d9e00 -s ours am: 979b9b2d -s ours" into rvc-qpr-dev-plus-aosp am: 74ba8e06 -s ours

am skip reason: subject contains skip directive

Change-Id: I14a84c92474bc97fbcaacb78daf5ea66fcf93adb