Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am: 30a1cf96 am: cfaeabb3 am: 4bcce2b2 Change-Id: Ifeb49f1b19ab36e438763b569c78a335b094f7d0