Merge change 8695

* changes:
  ContactsContract: Renaming CONTACT_ID to RAW_CONTACT_ID