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