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

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

Change-Id: I34b1e6e0848e978a55a6eb34c65b81294947ec27