services: fix boot loop issue

Conflicts:
	core/java/android/view/WindowManagerPolicy.java
	services/java/com/android/server/power/ShutdownThread.java