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
status bar power menu
rastapop settings rearrangement

- use separate fragment for section
- some renaming
Merge remote-tracking branch 'AOSP/lollipop-release' into lollipop-ras-mr1
status bar battery percentage: option for percentage inside icon
status bar settings: move brightness control to the top
redundant java edits
Merge remote-tracking branch 'upstream/lollipop-ras-mr1' into lp50x

Conflicts:
	res/values/ras_strings.xml
	res/xml/system_settings.xml