[automerger skipped] Merge "eSIM deprecated API Refactoring" am: f5ae7bfc7c am: 0dc1cfd6ff am: 9f0bb1ca41 am: ae2416cbe2 -s ours

am skip reason: Merged-In I0eca2130f785d264ab0e3302478cae3f30ba8c0a with SHA-1 b6c87871a8 is already in history

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

Change-Id: I84e1b28a939a60c1aa9dc6b2e05b6078225e4249