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

Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f9b47aa8 -s ours am: 2e88b2b9 -s ours" into rvc-d1-dev-plus-aosp am: b5f493e9 -s ours" into rvc-qpr-dev-plus-aosp