Backporting shortcut manager CTS to mr1

Bug 29612099

Change-Id: I620c7190b17c4ff9abd9f20f06ac0ab3d9cb7c3a
94 files changed