am 437db610: Merge "[ActivityManager] Do not add service to reschedule after removing users."

* commit '437db6106b20d5a81f12a93593b5f623b3159f19':
  [ActivityManager] Do not add service to reschedule after removing users.