Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fe1bd86217 -s ours am: 44bbe6ef17 -s ours" into rvc-d1-dev-plus-aosp am: 88103ba31a -s ours" into rvc-qpr-dev-plus-aosp am: 12609836b6 -s ours

am skip reason: subject contains skip directive

Change-Id: Id44332640167c72608c8806a76b4504b7cfcb9e2