am bcfa7cb2: am 259a649a: am 6091dcbb: Merge "[ActivityManager] Improve multi-thread access the same provider"

* commit 'bcfa7cb2508eb6f606aeef4c6cb44eaf9be07ccf':
  [ActivityManager] Improve multi-thread access the same provider