Settings for fingerprint

Change-Id: Ia883d3f6fd20ffe4c57c027d99201057bf7de403

Conflicts:
	AndroidManifest.xml
	res/values-es/strings.xml
	res/values-fr/strings.xml
	res/values-ja/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/SecuritySettings.java