Merge "[ActivityManager] Fix IndexOutOfBoundsException" am: a61515720a
am: 6c8b91d8c2

* commit '6c8b91d8c2c657eb8a5b0afa00a3b93044447f56':
  [ActivityManager] Fix IndexOutOfBoundsException