Merge "ConnectivityService: make log configurable" am: e42fbe4606
am: b700891a39

Change-Id: I70557edd9750549d91f58f1ca1e841055c69fabc