Merge "Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when..." into nyc-mr1-dev

api/current.txt

api/system-current.txt

api/test-current.txt

core/java/android/content/pm/ShortcutInfo.java

core/java/android/content/pm/ShortcutManager.java

.../core/java/com/android/server/pm/LauncherAppsService.java

...tests/src/com/android/server/pm/ShortcutManagerTest2.java