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

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



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