fix: Conflict incoming changes from 15-dev

src/com/android/launcher3/util/InstantAppResolver.java

@@ -18,20 +18,23 @@ package com.android.launcher3.util;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.util.Log;
 
-import com.android.launcher3.R;
+import com.android.launcher3.dagger.LauncherComponentProvider;
 import com.android.launcher3.model.data.AppInfo;
 
+import javax.inject.Inject;
+
 /**
  * A wrapper class to access instant app related APIs.
  */
-public class InstantAppResolver implements ResourceBasedOverride {
+public class InstantAppResolver {
+
+    @Inject
+    public InstantAppResolver() {
+    }
 
     public static InstantAppResolver newInstance(Context context) {
-        return Overrides.getObject(
-                InstantAppResolver.class, context, R.string.instant_app_resolver_class);
+        return LauncherComponentProvider.get(context).getInstantAppResolver();
     }
 
     public boolean isInstantApp(ApplicationInfo info) {