HeadsUp: User configurable timeout (1/2)

Change-Id: I263f8ea013f99488c2d1af97eff517db2b9d634b

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