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

Change-Id: Ie98d1e6aee39427d2ec87dcea50aed9bf0ead023