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

* commit '20553036af92a6369b3e53f54a1f4f0ccaf8e981':
  [ActivityManager] Fix index OOB when resetting removed task