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' into HEAD

Android 5.0.1 release 1
Settings: tint ic_drawer image

Change-Id: Ibe1dbb6ae64f166311fc73824d34cb3abd6bb350
Merge remote-tracking branch 'upstream/android-5.0' into android-5.0
Omni sync 5.0.1