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: 9c97757f am: 5c4bfa4c

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



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