Fixed conflicts

Change-Id: Iacc56cf42e577f9996c0cd23185a9b39e4f7ffa3

Conflicts:

	src/com/android/settings/SecuritySettings.java