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

Change-Id: I4e9887a438abfa1a5c9456c73c019c96193e9111
tree: e0e12dd3dd0d5905dbc01b2dcc730d959d70d396
  1. core/
  2. services/
  3. tests/