[automerger skipped] Merge "[MEP] Add port index to icc logical channel open,...

[automerger skipped] Merge "[MEP] Add port index to icc logical channel open, close and trasmit APIs." am: 2f173adb am: 89a0114f am: ea905c53 -s ours am: 7475dc64 -s ours

am skip reason: Merged-In I98036645023bd7ba12475d4a06ce64287401471b with SHA-1 5d4bad44 is already in history

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

Change-Id: Ib9c2414efedec2471d0a5ae99f456a0d00cbf6e6