Add some stuff for the new lockscreen options.

Change-Id: Ibde0683e9ed5338352eb6adad2a18699efdf856f