Settings: Remove lockscreen options from security.

  - Create a separate fragment for Lockscreen settings
  - Move App Security up in Security Settings
  - General clean up

Change-Id: I4dc20942b87c2446c7e798e28f7e475efebaddb8
(cherry picked from commit 57a5d830f72d1d20ae691fe90caa619a5c6ef7c4)

Conflicts:
	res/xml/security_settings_chooser.xml
	src/com/android/settings/SecuritySettings.java
Settings: Fix missing preference when lockscreen disabled.

    - Introduced in security settings reshuffle.

Change-Id: I1b6b608682208396d5efc54fd985652f65e86ffc
(cherry picked from commit 67c79fad971d8e7ffcb1ed5bcc30bf8a0a16d1d5)
Settings : Launch only contacts picker for blacklist entry

Change-Id: I266d1ad7f1aab745728b33490268cb197188f2b3
(cherry picked from commit 2913989d3cb5daa6dd0873d81142fbd322c64b3c)