Merge "Unit tests for "cmd shortcut"" into nyc-mr1-dev

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

diff --cc services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
Simple merge

diff --cc services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java
Simple merge