Merge "Update Security & screen lock preference"

diff --cc AndroidManifest.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/android/settings/SecuritySettings.java
Simple merge

diff --cc src/com/android/settings/core/gateway/SettingsGateway.java
Simple merge

diff --cc src/com/android/settings/location/LocationSettings.java
Simple merge

diff --cc src/com/android/settings/search/SearchIndexableResources.java
Simple merge