Frameworks: moar shortcut icons by Sven R.

Change-Id: I7d29a044ce2b928cac33bb6482604a984a2e1740
(cherry picked from commit 6ce653090f11085caaaef4e2b5c8c155ae858ea6)
Frameworks: Keyguard - Add user configurable shortcuts

Change-Id: If9bbf63067ce2294a09b1f8f70006adff035604d

Conflicts:

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

(cherry picked from commit 48d780ac694614a86e778418fb0cf9f8bd71b758)