Merge "[DO NOT MERGE]Fix IndexOutOfBoundsException for TDA stack" am: 59a5167438 am: 1cdca5e5be

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

Change-Id: Idd40ccfc7ad9b26ce8dafd68d43bb0e82142aad4