Merge "Updated deprecated Contacts API to ContactsContract"