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

Change-Id: I9f17b94e0e9494a5ecb20bd3d0cfe1c4d95f5cc8