Merge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev