Merge \"Check package name and user handle in onShortcutsChanged().\" into ub-launcher3-calgary
am: 64035e9ee6

Change-Id: Id435b3b7970c056efa39dc62a5288dc07319269c