Merge changes from topic 'aware_discovery_ranging'

* changes:
  WifiHal: Include nan availability config
  WifiHal: Enable NAN Ranging Cfg and Indication onMatch
tree: d92cc535996ef6a4c69cb5ab20cabb1caae5376d
  1. qcwcn/
  2. Android.mk