Merge "Fixed eSIM switch issue" into udc-dev am: 644a29ba

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



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