Merge "Changing the condition since the esim may be removable" into tm-dev am:...

Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c6 am: b0cc0e28

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



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