Merge "Adding support for passing arbitrary extras when requesting to pin a widget...

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/content/pm/LauncherApps.java
Simple merge

diff --cc services/core/java/com/android/server/pm/ShortcutService.java
Simple merge