Merge "Add UNDEMOTE_METHOD to ContactsContract"