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

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

Change-Id: Ide34ec7ee2e7a5881c97c9097415bb6c798c39c1