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

Change-Id: I5b40ddb8bcd3b393d237c663151f8fafac4d7a83