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 am: af87b620 am: f93d0c2b

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



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