Merge "[MEP] adding portindex to sim access APIs" am: e72e4ca85b am: 3d9bbd180e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038043

Change-Id: Ib16a8d3915795451876bbe544e122a08786d591a