Merge "[automerger skipped] Import translations. DO NOT MERGE am: d7102ca072 -s ours am: 24cc569d89 -s ours" into rvc-d1-dev-plus-aosp