Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev am: afc61792cb
am: b1c8a92746

Change-Id: Ia9b4f846ec8c8fb35230507947963ed4a803577e