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

am skip reason: Merged-In Ib57885c30d76bed06f5678f3f0b7078f61d0a1bc with SHA-1 8151bdd3e4 is already in history

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

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