Merge "Switch phones if PUK locked in DSDS configuration" into 24D1-dev