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

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

Change-Id: I5479f55b8a2bb4b3a36b306496dcedef946af5b1