Merge remote-tracking branch 'PA-settings/kitkat' into kitkat-remix

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