Merge "[owners] Remove curtislb@google.com from src/com/android/settings/password/OWNERS" into main
diff --git a/src/com/android/settings/nfc/OWNERS b/src/com/android/settings/nfc/OWNERS
index 2f73a10..55c4945 100644
--- a/src/com/android/settings/nfc/OWNERS
+++ b/src/com/android/settings/nfc/OWNERS
@@ -4,4 +4,3 @@
georgekgchang@google.com
# Emergency approvers in case the above are not available
-zachoverflow@google.com
diff --git a/src/com/android/settings/password/OWNERS b/src/com/android/settings/password/OWNERS
index 80e0da0..9e403d3 100644
--- a/src/com/android/settings/password/OWNERS
+++ b/src/com/android/settings/password/OWNERS
@@ -4,7 +4,6 @@
# Default reviewers for this and subdirectories.
graciecheng@google.com
ilyamaty@google.com
-jaggies@google.com
jbolinger@google.com
joshmccloskey@google.com
kchyn@google.com
diff --git a/src/com/android/settings/privatespace/OWNERS b/src/com/android/settings/privatespace/OWNERS
index 158c26a..a22bb0c 100644
--- a/src/com/android/settings/privatespace/OWNERS
+++ b/src/com/android/settings/privatespace/OWNERS
@@ -8,4 +8,3 @@
jigarthakkar@google.com
josephpv@google.com
onshimiye@google.com
-saumyap@google.com
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
index c6bdebd..c9cf5a2 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
@@ -56,7 +56,6 @@
import com.android.wifitrackerlib.WifiEntry.ConnectedState;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -73,7 +72,6 @@
import java.util.ArrayList;
import java.util.List;
-@Ignore("b/394813533")
@Deprecated(forRemoval = true)
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {