Merge "Add DEMOTED and UNDEMOTE TO ContactsContract"