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: 15c33001

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



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