Merge "passpoint-r2: change the name of OSU_FAILURE_INVALID_SERVER_URL"