Merge "Refactoring before adding a new view type in the WidgetsListAdapter" into sc-dev am: fa58bfa0b7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc0ce9eccb6c47d49612bb6d1d2aa974b4ce8200