Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev am: 7284e2a88b  -s ours
am: 6d50b1aefc  -s ours

Change-Id: I9e7d7dfdd09a31018421ed904da5665ff526ca3f