Merge "Rehide some fields in ContactsContract"