Merge "WifiMetrics: Add methods to increment new hal/cond metrics" into oc-dev
tree: 9acbfc4772514c53f9e6e7f0c60f465f0e9e9c47
  1. service/
  2. PREUPLOAD.cfg