PEEK: configurable pickup timeout (1/2)
- Allow the user to set different pickup timeout when a notification comes up through PEEK.
Options:
10 sec (default)
30 sec
45 sec
1 min
2 min

Credit: @cristianomatos

Change-Id: I82650f376b1dee81b5872317c70506d580361d49
[2/2] settings: Add Haptic Feedback to quicktiles
Credit: @cristianomatos

Change-Id: Ie0c2f12bda44967d063a2042926c7ab23e113750
Merge remote-tracking branch 'upstream/ose' into ose

Conflicts:
	res/values/ose_strings.xml
	res/xml/ose_lockscreen_settings.xml