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

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