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