Snap for 10594510 from fa1a110078 to udc-qpr1-release

Change-Id: I3fa7e1ca7cc01890da5aae44f8198ff48d1452d5

device.mk

@@ -41,15 +41,6 @@ include device/google/gs-common/misc_writer/misc_writer.mk
 
 include device/google/zuma/dumpstate/item.mk
 
-ifneq ($(BOARD_WITHOUT_RADIO),true)
-# Release stable version to factory image
-ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
-	include device/google/gs-common/gps/brcm/device.mk
-else
-	include device/google/gs-common/gps/brcm/device_v2.mk
-endif
-endif
-
 TARGET_BOARD_PLATFORM := zuma
 ALLOW_MISSING_DEPENDENCIES := true
 
@@ -1019,7 +1010,6 @@ $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT))
 ## Audio properties
 ##Audio Vendor property
 PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.audio.cca.enabled=false \
 	persist.vendor.audio.cca.unsupported=false
 
 PRODUCT_PROPERTY_OVERRIDES += \

device_framework_matrix_product.xml

@@ -106,7 +106,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>8</version>
+        <version>9</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>