Merge "Fix wrong index access in getSingleMessageFromIcc()" am: c0e3d3eed1 am: c47e97ea0c

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1365816

Change-Id: Ia580e756c5420e72e9dce9d12d2dcd85ba5fead9