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

Change-Id: I5c763c6d5c894f9c1ff2e637859ea24fd1f0835f