[automerger skipped] Merge "When erasing an eSIM, verify the device screen PIN...

[automerger skipped] Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev am: 29ad4163 -s ours

am skip reason: Merged-In I2c4d2b7e224973c4afa75573e05afe7607d2ae6b with SHA-1 f4462ac5 is already in history

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



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