Merge "Refrain from overwriting shortcut icon with default icon" into rvc-qpr-dev am: 3cdba9d5b5 am: 837e8d58fe

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

Change-Id: Ib016c3ffd100badf1d6e776be8ab7ac2449278d0