Merge "eSIM deprecated API Refactoring" am: f5ae7bfc7c

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

Change-Id: I8ef03b0a1fa3cca03e229839de67a464994b5ef2