[automerger skipped] Merge "Fix ArrayIndexOutOfBoundsException in IccNetworkDepersonalizationPanel" am: c4c4e9ba6e am: eaa66cec5f -s ours

am skip reason: Change-Id Id31ac22a1581daf68769c967494dab05c02983db with SHA-1 7068142d4a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1322518

Change-Id: I7e488dc19327fac73819d84699765c88e5fa0898