Frameworks: Keyguard - Add user configurable shortcuts

Change-Id: If9bbf63067ce2294a09b1f8f70006adff035604d

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/res/values/dimens.xml