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

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



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