Revert "Option to change number of QuickSettings columns…"

This reverts commit 7cfc1961a8210f84fb72f82e795b9e2341b0fd8f.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java

Change-Id: I544c77de51fde5374e9642a398c623041253ad5b