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

Change-Id: I468e31800d5cfe1dd385d773fcc393b615cfa343