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

Change-Id: If8a63ff363298af96be0d0331d103beaf08f8747