FWB: added screenshot delete action in notifications

allows deleting a screenshot from the notification
inspired from CarbonRom - initial from CM I guess

AICPfy:
brought in from KK

Change-Id: I67b7b9a7808ddb8c54ea4f3a45aad6d44833e1df
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.

AICPfy:
brought from kitkat

Change-Id: I64b5f53a4e6c4098640b2c0cb3af2a56d6df019f