Merge "Fix ArrayIndexOutOfBoundsException in IccNetworkDepersonalizationPanel" am: c4c4e9ba6e

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

Change-Id: I8b3a9c8c47127599f264a829457100af94ff0004