Merge "eSIM deprecated API test Refactoring" am: a4f936408c am: 688f9d61cd am: 3387491083

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

Change-Id: I95bbd270044702f0ed61b8f3cb0af03d6924ad4e