Merge "ConnectivityService: improve wakelock logging" am: d8f298365a
am: 07f66ed517

Change-Id: I780d4d8b622935fe1b356e823333199c0212fb5d