Merge "Log when wifi is turned on/off in metrics" into pi-dev
am: 51134fb02c

Change-Id: Ieabc87af0a9e375d6092e3150ab9415db3f2dd75