Merge \"Surround shortcut API calls with try-catch.\" into ub-launcher3-calgary
am: f50b3cb3cb

Change-Id: Iff0889ccb95a259ad5bddce4c9df931da4d8a44c