Merge changes I7f95fec0,I81810626 into rvc-dev

* changes:
  WifiDumpsysMetricsTest: ensure that only DUMP permission is needed
  Fix Wifi Metrics not uploading
tree: afe5eec10275460395d70cf78ae5f53220453f54
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg