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

Change-Id: I9a1acc5850245b5c5f0ca13d03f368fb4a0d2fa9