Merge "Make sure distinct widgets items are used when mapping widget component...

Merge "Make sure distinct widgets items are used when mapping widget component names to widget items." into sc-v2-dev am: 3bd6b8bf am: ddefceae

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

Change-Id: I9633178a5b1404604cae743b05484bbaed3c26fd