Merge "Remove the EABContract and use ContactsContract." into m-wireless-dev