[automerger skipped] Merge "[DO NOT MERGE]Fix IndexOutOfBoundsException for...

[automerger skipped] Merge "[DO NOT MERGE]Fix IndexOutOfBoundsException for TDA stack" am: 59a51674 am: 1cdca5e5 am: f18e48e5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ice709e6a521ca16b0ce0a688740a30306e8be7d6