[automerger skipped] [BugFix]Fixed a fatal exception which cause IndexOutOfBoundsException. am: 73a8d0df -s ours

am skip reason: Merged-In Ib57885c30d76bed06f5678f3f0b7078f61d0a1bc with SHA-1 72ce7d82 is already in history

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



Change-Id: I30dfaec125ea440f8a6f6980222668f9620c4f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>