[1/2] frameworks: port BatteryBar to Lollipop

Credit: gwindlord for the kitkat/jellybean commit
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
AdBlocker 2/3

Change-Id: I4bf5f55021cf234e47cf344d0183b24b1550ca4e
credit: tsubus