Merge "ConnectivityService: improve wakelock logging" am: d8f298365a am: 07f66ed517
am: 2cc55fb4f7  -s ours

Change-Id: Iffd07eab1b85603aa935c4253c526fa4dc2ff745