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: Icf20816c888986815590d798278a5e738a99fec1