Merge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev
am: 8664df3d76
Change-Id: I7abfe83f44599ff546034816e92b01a40a9f7a29
This commit is contained in:
am: 8664df3d76
Change-Id: I7abfe83f44599ff546034816e92b01a40a9f7a29