Merge "Fix wrong index access in getSingleMessageFromIcc()" am: c0e3d3eed1 am: c47e97ea0c am: 8a0ef87777 am: 5789e17c3a

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

Change-Id: I98034d80758d3b77c6bc97fdc9a43c168bb96300