Merge "Fix launcher crash after restore with some specific widgets." into...

Merge "Fix launcher crash after restore with some specific widgets." into ub-launcher3-rvc-qpr-dev am: 66402014

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

Change-Id: I2f180f865b2bcf51913b1185514095994b997170