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

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

Change-Id: Ie41a0b92d01203d65e3031902b639063887f3c1f