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

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