Merge "Follow ContactsContract API changes" into lmp-dev