Prevent factory reset for short passwords in CryptKeeper

Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

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

Conflicts:
	src/com/android/settings/CryptKeeper.java
Merge tag 'android-5.0.1_r1' of https://android.googlesource.com/platform/packages/apps/Settings into hazypop

Android 5.0.1 release 1

# gpg: error loading `iconv.dll': Impossibile trovare il modulo specificato.
#
# gpg: please see http://www.gnupg.org/download/iconv.html for more information
# gpg: Signature made 12/03/14 01:51:24 using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found