[automerger skipped] Merge "[MEP] eSIM API refactor to support MEP" am:...

[automerger skipped] Merge "[MEP] eSIM API refactor to support MEP" am: ed021212 am: 0da50937 am: 6ed304eb am: 5789584a -s ours

am skip reason: Merged-In I71e4e1ef649b7301d126dde23d53783761de940f with SHA-1 177c4a4d is already in history

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

Change-Id: I5863597d518fdc17485170c8c7ef978e0dba052e