Merge "(eSim) Return proper portindex for ONS profile." into tm-dev am:...

Merge "(eSim) Return proper portindex for ONS profile." into tm-dev am: 886afec7 am: 35e8a593 am: e0c0314b am: c5a8be99

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18344844



Change-Id: Ib5b91a6222d2868387bf033a8203cee1232e768c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>