FW: Ribbon Fix swipe ribbon and toggles for TabletUI

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

Patch Set 2: Fix import derp

Change-Id: I06408c0025001a7436342115c07055514bb3fd8c
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
Merge "FW: Ribbon Fix swipe ribbon and toggles for TabletUI" into jb2