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

Change-Id: I3d536324052227bbfab31ba5d608c35ecb9b1ab5