[DO NOT MERGE]Fix IndexOutOfBoundsException for TDA stack am: aee29007cf

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

Change-Id: I1110ff15be59a872a1016e490e1e5c76e5a85658