Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
am: c1987487a2

Change-Id: I2b7e0f63c8198c8fde52396f989c16d795e612a8