[automerger skipped] [DO NOT MERGE]Fix IndexOutOfBoundsException for TDA stack am: aee29007 am: dd316294 am: 38c6b8d6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I730869554b94eda6af0d8646e335aed03e020ff7