Merge "ConnectivityService: make log configurable"
am: 3ec9281fa8

Change-Id: I5991e26198aa5d5ad809e2585984cb643889a9d1