Merge "Merge "Changing the condition since the esim may be removable" into...

Merge "Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c6 am: 968da5c5" into tm-d1-dev-plus-aosp am: 35f2cf81 am: 0f62594f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901



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