Merge "Profile is getting activated on wrong portIndex" into udc-qpr-dev am: 9550ecc5

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



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