Merge "Merge "Changing the condition since the esim may be removable" into...

Merge "Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c6 am: 968da5c5" into tm-d1-dev-plus-aosp am: 35f2cf81

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



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