am 36045476: ContactsProvider2 optimization: performing phone matching entirely in the database

Merge commit '36045476d2cc7c9c2f985307e87cb6bbc4cfe434' into eclair-mr2-plus-aosp

* commit '36045476d2cc7c9c2f985307e87cb6bbc4cfe434':
  ContactsProvider2 optimization: performing phone matching entirely in the database