Merge "Move ScopedUidChange to test_utils.h"
diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index af3251a..2ca21ff 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -50,6 +50,7 @@
 #include <android-base/scopeguard.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
+#include <android-base/test_utils.h>
 #include <android/multinetwork.h>
 #include <binder/IPCThreadState.h>
 #include <bpf/BpfMap.h>
@@ -5171,6 +5172,7 @@
 }
 
 TEST_F(MDnsBinderTest, EventListenerTest) {
+    SKIP_WITH_HWASAN;  // TODO(b/253513842): Re-enable.
     // Start the Binder thread pool.
     android::ProcessState::self()->startThreadPool();