am f4a3b7e5: Solving deadlock in ContactProvider2

Merge commit 'f4a3b7e523e36679b68edd2af632e26648758ff2' into eclair-plus-aosp

* commit 'f4a3b7e523e36679b68edd2af632e26648758ff2':
  Solving deadlock in ContactProvider2