Fix pie activation when enabling expanded desktop from QS tile.

Change-Id: I0e8f9b0a723615971a2e14b1d69a71cbabafb26b

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