am "am c38b90bb: Merge "Make getNetworkInfo() take into account VPN underlying...
am "am c38b90bb: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
5984dabc am c38b90bb: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev