[automerger skipped] Merge "Addition of HW Revision to Wifi metrics" into pi-dev am: 1465046e39
am: e8c019cbfa  -s ours

Change-Id: I54834df930165fc72f59f83b5e83fe326a95e62b