[automerger skipped] Merge changes from topics "MEP_addPortIndex",...

[automerger skipped] Merge changes from topics "MEP_addPortIndex", "mep_switchToSubscription" am: 2773d203 am: 268dccdb am: d1ab424d -s ours am: 83dcca26 -s ours

am skip reason: Merged-In I6a802ea0c85ff749b09745f629bc1a80f30ed3b9 with SHA-1 9adebdf3 is already in history

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



Change-Id: Ic20ca3fe2310c1c284a27d1f1aed641561ab556d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>