[automerger skipped] Merge "[MEP] Integrate IccSlotStatus and SimSlotMapping...

[automerger skipped] Merge "[MEP] Integrate IccSlotStatus and SimSlotMapping AIDL changes." am: b9c279cb am: db0db9b2 am: 891d322c -s ours am: b9b970ce -s ours

am skip reason: Merged-In I59ad60847fcc2b9868ffc4f338cb17de5b64374d with SHA-1 aa5839da is already in history

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

Change-Id: I2665036b5f2232f4f442bcd057636b1e09535f66