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

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