Revert "hide keyguard camera"

This reverts commit 3414f6fb9d4e4ce7a827252195bb68998b47ceac.

Conflicts:
	res/values/rf_strings.xml

Change-Id: I803646cb7d9316ce101a11de8a93fe915f94bbd1
[2/2] Settings: Lockscreen tweaks

Base: https://gerrit.omnirom.org/#/c/4700/

Change-Id: Ic485195060c071f120022a52cfd85226b0c3a414

Conflicts:
	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_chooser.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/SecuritySettings.java
Settings: fix security settings

http://jira.omnirom.org/browse/OMNI-504

Change-Id: I857ca730dee460b2fdef81fbd0b23d0821f3e0bd

Conflicts:
	src/com/android/settings/SecuritySettings.java