Snap for 4632767 from 8e0b8e94efd547565a571a1bd5c4b2f62f59c168 to pi-release

Change-Id: I943d57dd855327a091c03e3c10807af47cdc9ab7
diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java
index 6ed2492..5b2271e 100644
--- a/src/com/android/internal/car/CarServiceHelperService.java
+++ b/src/com/android/internal/car/CarServiceHelperService.java
@@ -37,6 +37,7 @@
 public class CarServiceHelperService extends SystemService {
     private static final String TAG = "CarServiceHelper";
     private static final String CAR_SERVICE_INTERFACE = "android.car.ICar";
+    private static final String ICAR_BINDER_NAME = "car_service";
     private final ICarServiceHelperImpl mHelper = new ICarServiceHelperImpl();
     private final Context mContext;
     private IBinder mCarService;
@@ -59,6 +60,8 @@
                 Slog.w(TAG, "RemoteException from car service", e);
                 handleCarServiceCrash();
             }
+            // Publish the binder interface so CarPowrManagerNative can access CarService
+            publishBinderService(ICAR_BINDER_NAME, iBinder);
         }
 
         @Override