Merge "Add portIndex for switch subscription API" am: d9e8a4f5ff

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037585

Change-Id: Ibb579deeb47826fc012e85001d0437710ebd61ba