am cc9c597d: am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""

* commit 'cc9c597dad6d99242ed2903d8760922f66223401':
  Revert "[ActivityManager] Improve multi-thread access the same provider"