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

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

Change-Id: I46100f030897500f8eeac3fe2421fbb515ac06ae