Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"