[automerger skipped] Merge "[MEP] eSIM deprecated API Refactoring" am:...

[automerger skipped] Merge "[MEP] eSIM deprecated API Refactoring" am: c4795988 am: cb851c79 am: 44e579e3 am: 7639cd07 -s ours

am skip reason: Merged-In Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d with SHA-1 73f16339 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: I083a9fa1c4ac0c48b56bc16dfed355ba1433a5b5