Quicksettings: Bring up to date with CM implementation. [2/2]

Change-Id: I3f205390bb915c2336fc86f09ffb9829854659a9

Conflicts:
	src/com/android/settings/chameleonos/QuickSettings.java