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

Change-Id: I9187e8893d11ee1c71ced2bf9772dc193b504b57