[automerger skipped] Merge "[MEP] adding portindex to sim access APIs" am:...

[automerger skipped] Merge "[MEP] adding portindex to sim access APIs" am: e72e4ca8 am: 3d9bbd18 am: a8fa5198 -s ours am: 6b0ae59a -s ours am: d34467a1 -s ours

am skip reason: Merged-In I32fc94f2fe98c46d8bb0120fff49e5b72df27ddf with SHA-1 ed33fccf is already in history

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

Change-Id: If13a71d9f08e35580fee679ed2891ab313b63861