switcher preparation

Change-Id: I8e250fa963c9b4da45b53492eb30cf7549b9ff0f

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java