Here is a less controversial version of the SIM API change.
The reset password type is passed down to the driver.
The generic atmodem sim driver caches the pin type from last CPIN?, and if
it is not PUK, returns an error.
A quirk is added for mbm so it will try to trigger the +CPIN: SIM PUK/PUK2