HeadsUp: User configurable timeout [2/2]

Change-Id: I6c55636205237044891324f0dd855046aaafb256

Conflicts:
	res/values/kang_strings.xml
	res/xml/heads_up_settings.xml
	src/com/android/settings/ose/headsup/HeadsUpSettings.java