Frameworks: moar shortcut icons by Sven R.

Change-Id: I7d29a044ce2b928cac33bb6482604a984a2e1740
Frameworks: Keyguard - Add user configurable shortcuts

Change-Id: If9bbf63067ce2294a09b1f8f70006adff035604d

Conflicts:
	core/java/android/provider/Settings.java