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

Change-Id: Ib4765bddfa7afe4538ac81d92b9b5cc020b24a51