fix isActiveNetworkMetered with VPNs am: 97f679b04f
am: 8fa2e19e73

Change-Id: I177eff1237dd59514ccf91397a3d307148bc37b1
tree: ea8be08f006f8b0c7278f8c3155c49b49aa8855c
  1. core/
  2. services/
  3. tests/