Merge "Remove FeatureHighlight lib from AOSP contacts." into ub-contactsdialer-g-dev