Fix NPE in ConnectivityService

bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
Merge "PhoneWindowPolicy: Fix NPE race condition by excessive screen on delay" into cm-11.0
Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java