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

Change-Id: Id8ae92f0eec4284ff5ba59a4a8c2227e9a77765a