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

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

Change-Id: I344b64d3ab0147ddb3fa12c1e8bf14b1ab2f3a58