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

Original change: undetermined

Change-Id: I6d2990367a02202877408cb4396c08dacd21396b