Make notification-shade-collapse-after-dismiss behaviour configurable.

Change-Id: I1be0be2753b479e6d2e4fc8e17d971d03ce01bb7

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java