am 3389f7c7: ContactsProvider2 optimization: caching raw contact IDs involved in aggregation exceptions

Merge commit '3389f7c7df6c90e48fcb0c27832bc322e5b20bf6' into eclair-mr2-plus-aosp

* commit '3389f7c7df6c90e48fcb0c27832bc322e5b20bf6':
  ContactsProvider2 optimization: caching raw contact IDs involved in aggregation exceptions