[automerger skipped] [DO NOT MERGE]Fix IndexOutOfBoundsException for TDA stack am: d965659a am: 8c574bca -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13162525

Change-Id: I1ef4286799d1892a1f1cf8543d2dbf1db906b497