Merge "WifiMetrics: add methods to increment ONA metrics." into oc-mr1-dev
am: 878ca793d4

Change-Id: I4f4b49f963492a59085e8ba1f37b88713b6cf568
tree: 7d862cb2ff65f40ac403b30560a35f145e92d694
  1. service/
  2. PREUPLOAD.cfg