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