fix: Conflict incoming changes from 15-dev

systemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java

@@ -177,6 +177,13 @@ public interface ActivityStarter {
             boolean dismissShade,
             @Nullable String customMessage);
 
+    /** Starts an activity and dismisses keyguard. */
+    void startActivityDismissingKeyguard(Intent intent,
+            boolean onlyProvisioned,
+            boolean dismissShade,
+            @Nullable String customMessage,
+            Callback callback);
+
     /** Starts an activity and dismisses keyguard. */
     void startActivityDismissingKeyguard(Intent intent,
             boolean onlyProvisioned,