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

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

Change-Id: Ic592e3ff056b4b38c7ea85a2bdb4efa27855afad