[automerger skipped] Merge "Use portIndex when switching subscription" am:...

[automerger skipped] Merge "Use portIndex when switching subscription" am: 9195feb3 am: a64d5f79 am: 32a8fb38 -s ours am: 90533791 -s ours am: 5d887559 -s ours

am skip reason: Merged-In Ibf5b57c11b1aa38a1bbb75ccc316380ffe1d46ea with SHA-1 086197e6 is already in history

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

Change-Id: I290c9818a3cfa81e4bd94f2c2da433515cfc0fa8