Merge \"Implement dumpsys --checkin for shortcut manager\" into nyc-mr1-dev
am: 121480cda8

Change-Id: I38508e2b47dcb2fe2e8046f7c148b4ddbf6a2697