Merge "Fixed eSIM subscription disappeared" into udc-dev am: 196977e1 am: a00d2ef5

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



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