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