Merge "DO NOT MERGE Remove Yenta experiment (1/2)" into ub-contactsdialer-h-dev
am: 481f113445  -s ours

Change-Id: Ifbcbebc7ed95a8917804fc07b0603a409f90d4fd