Merge "Fix broken app icon on restart during install." into sc-dev am: 3115a4380b am: 54433ee9cc

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

Change-Id: I4f8db2bbe9aea139c11740d6a9a15b824f0351f6