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

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

Change-Id: I9a1a8e23e922cc6cf590103b2588ca98327e58f1