Framework: Shake to Temporarily Secure && Fixes(1/2)

Change-Id: I430eac6c93313e0efb3b4cff989e5a6e16694706

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java