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

Change-Id: Iaa8804ce9721bd47a6a26ca1d87d6d69793ba9c8