[automerger skipped] Fixed eSIM activation failed issue am: 030e35d4 -s ours...

[automerger skipped] Fixed eSIM activation failed issue am: 030e35d4 -s ours am: b67e8b5a -s ours

am skip reason: Merged-In I16f94ee3d3f79c1fbbabe22a8596c8c31724fca2 with SHA-1 5f17e943 is already in history

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



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