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

Change-Id: I07c20368230159ea28af24c95087e74a3e830ab5