[automerger skipped] Fixed eSIM switch issue am: 8f7659ce am: c981de01 -s ours

am skip reason: Merged-In I9ca6562659a426dbf5ba324118b9f4bb14512f3b with SHA-1 55ad74c1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2678597



Change-Id: Icdf3b009c5a724c7c675ed077f6b2306a1117979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>