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

* commit '7dafc74fda1b4333d9035892502657e1015f91c6':
  [ActivityManager] Fix IndexOutOfBoundsException