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

Change-Id: I9d370bdb5ecb030b550e6f8bf7c6b047da89c2e7