Merge "Updates to constructor of PluginInstanceManager.Factory" into sc-v2-dev am: 6eeb12e3eb

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

Change-Id: Id308c83114e7ef42b665464b374609e2d31984ee