am 0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"

* commit '0408187e7d2e7bdb6d0cb0521f49859a3d9a7396':
  [ActivityManager] Avoid unnecessary restart provider process