Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895 am: cb851c79ae

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

Change-Id: I580a094ed849679e0a7a96cd6c6558abe758a1ea