Merge "[automerger skipped] Import translations. DO NOT MERGE am: d20e87e9b2 -s ours am: 36b798d945 -s ours" into rvc-d1-dev-plus-aosp