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

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