Merge "ConnectivityService: detach the logic of global proxy." am: f386f9ec7e

Original change: undetermined

Change-Id: I4dec6ab3db4537cb7d3c6c8a74ad8a62198b3b2a