[automerger skipped] Merge changes from topics "MEP_addPortIndex",...

[automerger skipped] Merge changes from topics "MEP_addPortIndex", "mep_switchToSubscription" am: b9f93b22 am: 458f1763 am: 4d389357 -s ours am: 8746252d -s ours am: 9e18722c -s ours

am skip reason: Merged-In Ib365834290518872d50054e621b61968025ed47b with SHA-1 c260996d is already in history

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



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