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

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

Change-Id: Ic1f02e95e14d6edb511483f0b35a4c7d7529c3ba