Revert "Revert "Framework: Add Advanced reboot (2 of 2)""

This reverts commit c671219764ae9c03ef3ea2a62516b4c75115a034.

Conflicts:
	services/java/com/android/server/power/ShutdownThread.java

 Changes to be committed:
	modified:   core/java/android/provider/Settings.java
	modified:   services/java/com/android/server/power/ShutdownThread.java