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

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



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