tree cd283307a5a3257a2195006775ffad74bd2b78fc
parent f57f492b2c6fb278def849cddb5d3a4e9a8b2c08
parent a4084c87e84d0aa426a32744da571fbf3092ab89
author Varun Anand <vaanand@google.com> 1551751747 -0800
committer android-build-merger <android-build-merger@google.com> 1551751747 -0800

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

Change-Id: I3d536324052227bbfab31ba5d608c35ecb9b1ab5