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