fix bug that replacing general resource drawable with package's icon

Change-Id: I9e0860041b3a41e33e4420061890871d766e6585
new strategy to lock keyguard when there are many fail unlock attempts

Change-Id: If051c0dd3f2b052efe20fee42b52a685244da7d5

Conflicts:

	android[B.policy.jar.out/smali/com/android/internal/policy/impl/LockPatternKeyguardView$3.smali
	android.policy.jar.out/smali/com/android/internal/policy/impl/LockPatternKeyguardView.smali