[automerger skipped] Merge "Handle ArrayIndexOutOfBoundsException for...

[automerger skipped] Merge "Handle ArrayIndexOutOfBoundsException for install_sessions.xml" into main am: 89cc2c3b am: 343ff810 -s ours am: e90e8ae6 -s ours

am skip reason: Merged-In I99324e91a2da13bc86d62086aead40cc16cac60b with SHA-1 c23e36b8 is already in history

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



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