Merge "Adds PnoScanMetrics to wifi.proto" into oc-mr1-dev