diff --git a/api/current.txt b/api/current.txt
index 0db8efcf7c432..2ebb75dedf1fc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -7403,6 +7403,12 @@ package android.app.admin {
     field public static final int ERROR_UNKNOWN = 1; // 0x1
   }
 
+  public final class UnsafeStateException extends java.lang.IllegalStateException implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.UnsafeStateException> CREATOR;
+  }
+
 }
 
 package android.app.assist {
diff --git a/core/api/current.txt b/core/api/current.txt
index 6643e1fd19ea9..31264b9f46a7a 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -7403,6 +7403,12 @@ package android.app.admin {
     field public static final int ERROR_UNKNOWN = 1; // 0x1
   }
 
+  public final class UnsafeStateException extends java.lang.IllegalStateException implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.UnsafeStateException> CREATOR;
+  }
+
 }
 
 package android.app.assist {
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 7a74ad1d6d1d0..ef4dfdf59e9b0 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -369,12 +369,17 @@ package android.app.admin {
     method public boolean isCurrentInputMethodSetByOwner();
     method public boolean isFactoryResetProtectionPolicySupported();
     field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";
+    field public static final int OPERATION_LOCK_NOW = 1; // 0x1
   }
 
   public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {
     ctor public SecurityLog.SecurityEvent(long, byte[]);
   }
 
+  public final class UnsafeStateException extends java.lang.IllegalStateException implements android.os.Parcelable {
+    method public int getOperation();
+  }
+
 }
 
 package android.app.blob {
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index ead032ad660ce..01f3932a79abb 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2454,7 +2454,7 @@ public class DevicePolicyManager {
     public @interface PersonalAppsSuspensionReason {}
 
     /** @hide */
-    // TODO(b/172376923): make it TestApi
+    @TestApi
     public static final int OPERATION_LOCK_NOW = 1;
 
     // TODO(b/172376923) - add all operations
diff --git a/core/java/android/app/admin/UnsafeStateException.java b/core/java/android/app/admin/UnsafeStateException.java
index d00eb5001f7dc..9dcaae42e96e7 100644
--- a/core/java/android/app/admin/UnsafeStateException.java
+++ b/core/java/android/app/admin/UnsafeStateException.java
@@ -16,6 +16,7 @@
 package android.app.admin;
 
 import android.annotation.NonNull;
+import android.annotation.TestApi;
 import android.app.admin.DevicePolicyManager.DevicePolicyOperation;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -27,10 +28,7 @@ import android.os.Parcelable;
  * <p>For example, it can be thrown on
  * {@link android.content.pm.PackageManager#FEATURE_AUTOMOTIVE automotive devices} when the vehicle
  * is moving.
- *
- * @hide
  */
-// TODO(b/172376923): make it public
 @SuppressWarnings("serial")
 public final class UnsafeStateException extends IllegalStateException implements Parcelable {
 
@@ -44,7 +42,7 @@ public final class UnsafeStateException extends IllegalStateException implements
     }
 
     /** @hide */
-    // TODO(b/172376923): make it TestApi
+    @TestApi
     public @DevicePolicyOperation int getOperation() {
         return mOperation;
     }