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

Change-Id: I9f855aa1f81c5517de8a5e024afb10d5d8711ce3