am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task"

* commit '686947801e7c35eb60bf25385f46e45db66bee69':
  [ActivityManager] Fix index OOB when resetting removed task