Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1