Merge "Lockscreen Options : Disable keyguard camera only" into cm-10.1

Change-Id: I3692382fdf56d8d368e7cc0c6d5e0887506ca4fd