Merge "eSIM deprecated API Refactoring" am: f5ae7bfc7c am: 0dc1cfd6ff am: 9f0bb1ca41

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1934947

Change-Id: I5d42c10057ffa50f0124e36fa3ca29b81e82fa06