Lockscreen: Add timeout and instant lock option to slide lock (1/2)

  This adds AOSP's new timeout and instant lock options to the
  slide (aka chooser) style lockscreen.
  To Do: Add the vibrate option as well.

Change-Id: Ide8e8d14603e5111debcc7a7cf6c4b74898bfa3d
Merge "Lockscreen: Add timeout and instant lock option to slide lock (1/2)" into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1