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

Change-Id: I7049b0090c312774f158b9654ecabcb13c863024