Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8150894a -s ours am: 9caa07c2 -s ours" into rvc-qpr-dev-plus-aosp