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

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

Change-Id: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4