Merge "[AWARE][VTS] Update WifiChipHidlTest NAN tests" into oc-dev