Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev
am: 9480c98ddf

Change-Id: If0820595b9695f1771c5c6b9ad52689d428447f5