diff --git a/api/current.txt b/api/current.txt
index 1143d6b39d9e4..76b284a3b1b76 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23897,19 +23897,6 @@ package android.net {
     field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;
   }
 
-  public abstract class PskKeyManager {
-    ctor public PskKeyManager();
-    method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);
-    method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);
-    method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);
-    method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);
-    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);
-    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);
-    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
-    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
-    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
-  }
-
   public final class RouteInfo implements android.os.Parcelable {
     method public int describeContents();
     method public android.net.IpPrefix getDestination();
diff --git a/api/removed.txt b/api/removed.txt
index 239eab6570083..683a695ef8a02 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -167,6 +167,13 @@ package android.media.tv {
 
 package android.net {
 
+  public abstract class PskKeyManager {
+    ctor public PskKeyManager();
+    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
+    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
+    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
+  }
+
   public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
     method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
   }
diff --git a/api/system-current.txt b/api/system-current.txt
index f187a87313ba8..b9c8a58fad63a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -25756,19 +25756,6 @@ package android.net {
     field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;
   }
 
-  public abstract class PskKeyManager {
-    ctor public PskKeyManager();
-    method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);
-    method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);
-    method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);
-    method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);
-    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);
-    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);
-    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
-    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
-    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
-  }
-
   public final class RouteInfo implements android.os.Parcelable {
     method public int describeContents();
     method public android.net.IpPrefix getDestination();
diff --git a/api/system-removed.txt b/api/system-removed.txt
index 3811e22dd4e71..98e7953b6b257 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -165,6 +165,13 @@ package android.media.tv {
 
 package android.net {
 
+  public abstract class PskKeyManager {
+    ctor public PskKeyManager();
+    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
+    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
+    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
+  }
+
   public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
     method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
   }
diff --git a/api/test-current.txt b/api/test-current.txt
index d3c6e30edc31b..d588b7d6ee4b4 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -23970,19 +23970,6 @@ package android.net {
     field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;
   }
 
-  public abstract class PskKeyManager {
-    ctor public PskKeyManager();
-    method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);
-    method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);
-    method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);
-    method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);
-    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);
-    method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);
-    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
-    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
-    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
-  }
-
   public final class RouteInfo implements android.os.Parcelable {
     method public int describeContents();
     method public android.net.IpPrefix getDestination();
diff --git a/api/test-removed.txt b/api/test-removed.txt
index 239eab6570083..683a695ef8a02 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -167,6 +167,13 @@ package android.media.tv {
 
 package android.net {
 
+  public abstract class PskKeyManager {
+    ctor public PskKeyManager();
+    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
+    field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
+    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
+  }
+
   public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
     method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
   }
diff --git a/core/java/android/net/PskKeyManager.java b/core/java/android/net/PskKeyManager.java
index 667abb49a81c2..f5167eafab62a 100644
--- a/core/java/android/net/PskKeyManager.java
+++ b/core/java/android/net/PskKeyManager.java
@@ -104,6 +104,8 @@ import javax.net.ssl.SSLEngine;
  *
  * SSLSocket sslSocket = (SSLSocket) sslContext.getSocketFactory().createSocket(...);
  * }</pre>
+ *
+ * @removed This class is removed because it does not work with TLS 1.3.
  */
 public abstract class PskKeyManager implements PSKKeyManager {
     // IMPLEMENTATION DETAILS: This class exists only because the default implemenetation of the