Merge "ConnectivityService: simplify WakeLock management" am: c98db5caa2 am: 6db00a22b0
am: 56ca1705d6

Change-Id: Iacc2e977c1eec2ebc9deb9395e1f77a62b57f070