Merge "passpoint-r2: change the status for server connection"