Merge "Merge "CarSystemUIModule/CarSystemUIRootComponent public" into rvc-dev am: 51a5c0c3e5 am: 667368173a" into rvc-d1-dev-plus-aosp am: 573997d8f5

Change-Id: I1f247584e4abe0be97a4d6a9641112750c19e472

packages/CarSystemUI/src/com/android/systemui/CarComponentBinder.java

@@ -28,7 +28,6 @@ import dagger.Module;
 @Module(includes = {
         DefaultActivityBinder.class,
         DefaultBroadcastReceiverBinder.class,
-        DefaultServiceBinder.class,
-        CarSystemUIBinder.class})
+        DefaultServiceBinder.class})
 public class CarComponentBinder {
 }

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

@@ -65,7 +65,7 @@ import dagger.Module;
 import dagger.Provides;
 
 @Module(includes = {DividerModule.class})
-abstract class CarSystemUIModule {
+public abstract class CarSystemUIModule {
 
     @Singleton
     @Provides

packages/CarSystemUI/src/com/android/systemui/CarSystemUIRootComponent.java

@@ -40,6 +40,6 @@ import dagger.Component;
                 CarSystemUIModule.class,
                 CarSystemUIBinder.class
         })
-interface CarSystemUIRootComponent extends SystemUIRootComponent {
+public interface CarSystemUIRootComponent extends SystemUIRootComponent {
 
 }