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

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

Change-Id: I28b2a088ec14a8f734b5fafcddd110c09185408a