Merge "Address Unflagged API: android" into main
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 2af3c34..5bbff0b 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -120,7 +120,6 @@
method @NonNull public android.os.IBinder getProcessToken();
method @NonNull public android.os.UserHandle getUser();
field public static final String PAC_PROXY_SERVICE = "pac_proxy";
- field public static final String REMOTE_AUTH_SERVICE = "remote_auth";
field public static final String TEST_NETWORK_SERVICE = "test_network";
}
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 59bb73b..7afc29c 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -6370,7 +6370,6 @@
* @see android.remoteauth.RemoteAuthManager
* @hide
*/
- @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public static final String REMOTE_AUTH_SERVICE = "remote_auth";
/**