Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery [DO NOT MERGE]" into mm-wireless-dev