Merge "Adds a new adb command to get shortcuts from shortcut service" into sc-dev