Merge "API changes for ContactsContract" into lmp-dev