Merge "Preventing a shortcut which requires permissions from being added to homescreen" into ub-launcher3-calgary-polish
am: acd0c4204b

Change-Id: Ide95340d3a4589a15bcb076e56f75da3a6e3c204