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

Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824