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