Merge "ConnectivityService: simplify WakeLock management"