Merge cherrypicks of ['googleplex-android-review.googlesource.com/36804013'] into 25Q4-release. Change-Id: I9baf8a225a0d853b52e9cf96139fd36a1e77f896

diff --git a/core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java b/core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java
index 0c909cc..c3a1f42 100644
--- a/core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java
+++ b/core/java/android/os/CombinedDeliMessageQueue/MessageQueue.java

@@ -218,7 +218,9 @@
         if (sSkipEpollWaitForZeroTimeoutInitialized) {
             return;
         }
-        nativeSetSkipEpollWaitForZeroTimeout(ptr);
+        if (Flags.nativeLooperSkipEpollWaitForZeroTimeout()) {
+            nativeSetSkipEpollWaitForZeroTimeout(ptr);
+        }
         sSkipEpollWaitForZeroTimeoutInitialized = true;
     }
 

diff --git a/core/java/android/os/CombinedMessageQueue/MessageQueue.java b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
index c8d6e86..e22ef2e 100644
--- a/core/java/android/os/CombinedMessageQueue/MessageQueue.java
+++ b/core/java/android/os/CombinedMessageQueue/MessageQueue.java

@@ -214,7 +214,9 @@
         if (sSkipEpollWaitForZeroTimeoutInitialized) {
             return;
         }
-        nativeSetSkipEpollWaitForZeroTimeout(ptr);
+        if (Flags.nativeLooperSkipEpollWaitForZeroTimeout()) {
+            nativeSetSkipEpollWaitForZeroTimeout(ptr);
+        }
         sSkipEpollWaitForZeroTimeoutInitialized = true;
     }