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

Change-Id: I4e8deaf89a5cb0327e38866b9c205871057fdd92