Merge "Fix some widget picker recommended widgets bugs." into sc-dev am: 1722e2f855

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

Change-Id: I14bcf6d0e9988a2a2c04f5e421c641486383175f