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

Change-Id: I4f4b49f963492a59085e8ba1f37b88713b6cf568