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

Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
tree: 053f2ba07b6b8c4db1670f89bb6013d9ca1b2c91
  1. core/
  2. services/
  3. tests/