Merge "ConnectivityService: make log configurable"