Security Settings: cleanup and rearrange menu order
Settings: Disable search item in some fragments.

Change-Id: I17ed6945f34f2fe7bb18674124f8a8989145b8c1

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