Merge "Change status bar icons upon capability changes in the default network." into pi-dev
am: ceeba4f6d6

Change-Id: I811a18f21270e30dcf8fff6912bc4da2a9bb8db2