Merge "passpoint-r2: change the behavior for APIs when Passpoint is not enabled"