Merge "Fix isActiveNetworkMetered for VPNs."
am: 92c55f03c6

Change-Id: Ic219c083dffa426a8c6f548ff6a3f4b5c2555217