Frameworks: Respect and handle shorcut custom icon resources (1/2)

If a activity shorcut has an extra icon resource or drawable we need to handle
it. Fix this for all out shortcut features. Most is centralized so a small change

Change-Id: I4f1b78e5979e23f5edd0c670510ab5d718710a93