Merge "ContactsContract API changes per API review" into lmp-dev