am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying...
am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90bb
* commit '00c8450d':
Make getNetworkInfo() take into account VPN underlying networks.