fix isActiveNetworkMetered with VPNs am: c81ef19954
am: 351b45873d

Change-Id: I177eff1237dd59514ccf91397a3d307148bc37b1