am 3684089a: ContactsProvider2 optimization: Performing name and email lookup entirely in the database

Merge commit '3684089aba82df3f7a0c111e7c96ed8b0380e57a' into eclair-mr2-plus-aosp

* commit '3684089aba82df3f7a0c111e7c96ed8b0380e57a':
  ContactsProvider2 optimization: Performing name and email lookup entirely in the database