Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev
am: e2bc2efe3c

Change-Id: Ie1366ad3364176dce6a5f7b5a78a19b7806030cd