Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c34ae0bac8 -s ours am: 98b69f7e74 -s ours" into rvc-qpr-dev-plus-aosp