Revert "clear conflicts"

This reverts commit 3f032ff776df4b96a18d82a1f9ecea46087b06c4.

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java