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

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