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

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



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