Merge "ConnectivityService: simplify WakeLock management" am: c98db5ca am: 6db00a22 am: 56ca1705 am: e92a4ba7 Change-Id: Id8ae92f0eec4284ff5ba59a4a8c2227e9a77765a