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
(2/2) Settings: custom power key chord actions and delay

Change-Id: I6aec9b0d718bfc88291224aedc9e49f743e0b144
Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1

Change-Id: Ica3464b24a4e540cfae1273b079e6e358db354d0