Merge "Adds PnoScanMetrics to wifi.proto" into oc-mr1-dev
am: 63c5cd7fb0

Change-Id: I9b349268177e9059268a3131467cccd59efac7b0