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

  This adds AOSP's new timeout and instant lock options to the
  slide (aka chooser) style lockscreen.

Change-Id: I64b5f53a4e6c4098640b2c0cb3af2a56d6df019f
Merge "Lockscreen: Add timeout and instant lock option to slide lock (2/2)" into kitkat