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

Change-Id: I25d009155441f1f3c58f03a11d9b93808d62d963