Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am: 30a1cf96bb am: cfaeabb3e3 am: 4bcce2b2ef
am: 72240b9eeb

Change-Id: If45443143777e1446c812563742ae8af68d8f73e