Merge "WifiMetrics: add Passpoint related metrics" into oc-dr1-dev
am: b07f49dd92

Change-Id: I37cfce7193a4fa7bc1d8edc2e513d62345ed8406