Backporting shortcut manager test utils to mr1

Bug 29612099

Change-Id: I33641b2c95f8fe859fa3256b491c039ab273fff5
2 files changed