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: 968da5c5

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



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