Remove cameraserver from car products

Because Extended View System provides the surface to use camera streams
in Android car products, this change removes cameraserver from car
product build script and configure EVS manager to override cameraserver.

Also, this change sets config.disable_cameraservice as true for the car
products, to configure Camera API not to connect to cameraserver.

Bug: 170790154
Test: Build image, `grep cameraserver
      $ANDROID_PRODUCT_OUT/installed-files.txt` does not show
      cameraserver and cameraserver.rc
Change-Id: If67b5acf416142787f1701ba1693927ce2c11296
Merged-In: If67b5acf416142787f1701ba1693927ce2c11296
(cherry picked from commit 3a4682d1e28a4fb77869dbe19c3088d08238ba35)
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index 6fdd02a..531aa1e 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -52,7 +52,6 @@
     MmsService \
     ExternalStorageProvider \
     atrace \
-    cameraserver \
     libandroidfw \
     libaudioutils \
     libmdnssd \
@@ -66,12 +65,16 @@
     car-bugreportd \
 
 # EVS resources
-PRODUCT_PACKAGES += android.automotive.evs.manager@1.0
+PRODUCT_PACKAGES += android.automotive.evs.manager@1.1
 # The following packages, or their vendor specific equivalents should be include in the device.mk
 #PRODUCT_PACKAGES += evs_app
 #PRODUCT_PACKAGES += evs_app_default_resources
 #PRODUCT_PACKAGES += android.hardware.automotive.evs@1.0-service
 
+# EVS manager overrides cameraserver on automotive implementations so
+# we need to configure Camera API to not connect to it
+PRODUCT_PROPERTY_OVERRIDES += config.disable_cameraservice=true
+
 # Device running Android is a car
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.type.automotive.xml:system/etc/permissions/android.hardware.type.automotive.xml
diff --git a/evs/manager/1.1/Android.bp b/evs/manager/1.1/Android.bp
index d9c7d33..a88473b 100644
--- a/evs/manager/1.1/Android.bp
+++ b/evs/manager/1.1/Android.bp
@@ -78,6 +78,8 @@
 cc_binary {
     name: "android.automotive.evs.manager@1.1",
 
+    overrides: ["cameraserver"],
+
     srcs: [
         "Enumerator.cpp",
         "HalCamera.cpp",