Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev