Merge "ConnectivityService: minor formatting change"