Merge "Fix erasing of eSIMs for some devices" into qt-dev
am: 1f942d9857

Change-Id: I04bc60ed040546a64ea157840b76d815169d32a3