[automerger skipped] Merge "[MEP] Integrate MEP CardStatus and SlotPortMapping...

[automerger skipped] Merge "[MEP] Integrate MEP CardStatus and SlotPortMapping AIDL changes" am: e08749de am: 75719e0e am: 9f69cff1 am: aad6d0e7 -s ours

am skip reason: Merged-In I82587aa44db4cb2ad7cd708b51ead00d678be12e with SHA-1 7c9ef8d0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1934842

Change-Id: Icd092a7c6fa55d08f4b94ea8e8e5f96d90becab9