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

Change-Id: I4e9887a438abfa1a5c9456c73c019c96193e9111