Merge "Have the status bar listen to all macro-users VPN changes." am: b16a6053fe am: eb358dadac
am: 1d884f2797

Change-Id: Iabaa49f7a7de618ff45c662f04402f1bb3d4c5f1