To Backport the N-Mr1 Changes

To Backport the N-Mr1 Changes

Merge remote-tracking branch 'origin/wlan-aosp.lnx.2.0.c1-rel' into wlan-aosp.lnx.2.0.c1-dev

* origin/wlan-aosp.lnx.2.0.c1-rel:
  wifi-hal: Send link stats after all events are received
  Wifi-Hal: Changes related to NAN 1.0 for certification

Change-Id: I625f4ed5aaa54b650fb05719e543b309daec1dfb
CRs-Fixed: 1099457
tree: f016d0fadad115cfce27936de1689e798d2de8f3
  1. qcwcn/
  2. wcnss-service/