[automerger skipped] Merge "Log when wifi is turned on/off in metrics" into pi-dev am: 51134fb02c
am: 9b2e34e436  -s ours

Change-Id: I3a36f299a7380e5d85dae72d1eeb4e1025ddd1f1