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

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

Change-Id: Ia2ff17035856f6e3221f515bcf98955f0d3b81da