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