Merge \"Making the security checks and policy changes only when launching custom shortcuts. This prevents launcher specific intents to unknowingly leak data.\" into ub-launcher3-calgary
am: 055792afba

Change-Id: I0292309aee0e7e229a3cbf7b31394d04cc5fc956