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

Change-Id: Icac0e50bae970e7aaa9eecc3d7be3c19b2111a78