Merge changes Icd31ab2a,I801ce489

* changes:
  WifiConfigStore: Fix dump formatting
  WifiMetrics: Report metrics for new API surfaces
tree: d4f5a3cccabedbe745ec3ffb5810eb992074d6f2
  1. service/
  2. PREUPLOAD.cfg