[automerger skipped] Merge "Add portIndex for switch subscription API" am: d9e8a4f5ff am: effba65e40 am: d16a6a76ad -s ours am: d67b19f312 -s ours am: bd009627a4 -s ours
am skip reason: Merged-In Ic289538f5df17c03b2f8da7f4966c583d4557586 with SHA-1 95c4643204 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037585
Change-Id: I2e23f022205403d8724d7cca0221a536d070e47d
This commit is contained in: