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

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

Change-Id: Iec896dccd3c15be43a512a896bd6df6bb3e6c5b4