Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)" into oc-dev am: 10abacf3f3
am: d3790e9dfa

Change-Id: Ic11d92e3b653ab712c308a540908b257d5ffe45d