am 0f511622: Making contacts provider tests run again

Merge commit '0f5116227592cb8e724542c598daffa383964679' into eclair-plus-aosp

* commit '0f5116227592cb8e724542c598daffa383964679':
  Making contacts provider tests run again