Merge change 8735

* changes:
  ContactsContract: Renaming Aggregates to Contacts