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.

Change-Id: Ide8e8d14603e5111debcc7a7cf6c4b74898bfa3d
Add versions to device info
[2/2] ElectronBeam: Add an alternative screen-off animation

Adds a selector to choose the screen-off animation.

Change-Id: I5109ca899a75dae2e991ca57811acd57af10a48b

Conflicts:
	res/values/custom_strings.xml
	res/xml/display_settings.xml

Conflicts:

	res/values/cm_strings.xml