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

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



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