Merge "[AWARE][VTS] Update WifiChipHidlTest NAN tests" into oc-dev am: 24e1601315
am: 490ea3f105

Change-Id: I99d7e734070217f324f7bf1377a33d0af34bf19a