Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 5bef533f30 -s ours" into rvc-d1-dev-plus-aosp