Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am: c1987487a2 am: 555812a3e2
am: 65e01ec4ed

Change-Id: Idfe2c34bad70e0044d7281ba9b9aaaf26f7e2fb5