Snap for 9000845 from 2325f3de87 to udc-release

Change-Id: I4bf00adcdba29116bdeeffe6941b16b2fb488796

BoardConfig-common.mk

@@ -129,7 +129,7 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 BOARD_USES_SWIFTSHADER := false
 
 # This should be the same value as USE_ANGLE in device.mk
-BOARD_USES_ANGLE := true
+BOARD_USES_ANGLE := false
 
 # Gralloc4
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
@@ -420,6 +420,3 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K
 
 # Protected VM firmware
 BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
-
-# pick up library for cleaning digital car keys on factory reset
--include vendor/google_devices/gs-common/proprietary/BoardConfigVendor.mk

device.mk

@@ -184,7 +184,7 @@ endif
 USE_SWIFTSHADER := false
 
 # Must match BOARD_USES_ANGLE in BoardConfig.mk
-USE_ANGLE := true
+USE_ANGLE := false
 
 # HWUI
 TARGET_USES_VULKAN = true

powerstats/Gs201CommonDataProviders.cpp

@@ -381,7 +381,7 @@ void addGPU(std::shared_ptr<PowerStats> p) {
         {"848000", 4044}};
 
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
-            EnergyConsumerType::OTHER, "GPU", {"S8S_VDD_G3D_L2"},
+            EnergyConsumerType::OTHER, "GPU", {"S8S_VDD_G3D_L2", "S2S_VDD_G3D"},
             {{UID_TIME_IN_STATE, "/sys/devices/platform/28000000.mali/uid_time_in_state"}},
             stateCoeffs));