[automerger skipped] Changing the condition since the esim may be removable...

[automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66 am: 5de8fbc2 -s ours

am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f5120 is already in history

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



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