Merge "Use promisedIntent instead of intent when deep shortcuts are restored." into ub-launcher3-calgary-polish
am: 765ff3d7c9

Change-Id: Icd239f0afb1f17a1f65a015b6edca34299acb0ab