Hybrid toggle

Change-Id: I5bdab2c3671c09ea0ba0b043f2c247ea3c02652a

Conflicts:

	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/cm/QSConstants.java
	services/java/com/android/server/StatusBarManagerService.java