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

Change-Id: Ied1abbaceeae30a5006b17c77969d3c08872ff12