Merge cherrypicks of ['googleplex-android-review.googlesource.com/32688303'] into 25Q2-release.

Change-Id: Ia81981d2fd9edca1ab2399830774c30806fe63cc

sensorservice/aidl/vts/VtsHalSensorManagerTargetTest.cpp

diff --git a/sensorservice/aidl/vts/VtsHalSensorManagerTargetTest.cpp b/sensorservice/aidl/vts/VtsHalSensorManagerTargetTest.cpp
index 5b791bf..d8d22bf 100644
--- a/sensorservice/aidl/vts/VtsHalSensorManagerTargetTest.cpp
+++ b/sensorservice/aidl/vts/VtsHalSensorManagerTargetTest.cpp
@@ -286,7 +286,7 @@
     }
 }
 
-TEST_P(SensorManagerTest, CreateGrallocDirectChannel) {
+TEST_P(SensorManagerTest, DISABLED_CreateGrallocDirectChannel) {
     std::vector<SensorInfo> sensorList;
     auto res = GetSensorList(&sensorList, [](const auto& info) {
         return info.flags & SensorInfo::SENSOR_FLAG_BITS_DIRECT_CHANNEL_GRALLOC;