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

Change-Id: I1872725e46ac5ccf9f51d2a0818a93d55a094d01