Gesture anywhere: Collapse if expanded when screen turns off.

Change-Id: I85c749182dab9e478d7337b3556c362eaa7dd74d

Conflicts:
	core/java/android/annotation/OSELab.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java