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

Change-Id: I44e11b7a63c329883b01dc03f820e807c15953cf