[automerger skipped] Merge "Add portIndex for switch subscription API" am:...

[automerger skipped] Merge "Add portIndex for switch subscription API" am: d9e8a4f5 am: effba65e am: d16a6a76 -s ours

am skip reason: Merged-In Ic289538f5df17c03b2f8da7f4966c583d4557586 with SHA-1 95c46432 is already in history

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

Change-Id: I3c140af4cea029444a2578c33320285b58b50a99