Merge "IWifi: Validate dedicated NAN discovery interface." into rvc-dev