Advanced reboot enabled by default (2/2)

Conflicts:

	src/com/android/settings/DevelopmentSettings.java

Change-Id: I2697d3f570d1411ab2b0826e2f31b59db65b2498