Merge "Fix the fallback logic for shortcut icons when icons are missing" into sc-v2-dev am: e9316d5ba7 am: fa30672ec7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16124501

Change-Id: I7fea7a7151014fedd7671a4d116e878e09e6bf88