Merge "Have the status bar listen to all macro-users VPN changes." am: 90988528c3
am: cdb95af156

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