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