Merge changes I7f95fec0,I81810626 into rvc-dev

* changes:
  WifiDumpsysMetricsTest: ensure that only DUMP permission is needed
  Fix Wifi Metrics not uploading