Merge "Make ScreenEvent match values in contacts_extensions.proto" into ub-contactsdialer-i-dev