diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 765a17f7691a8..c79c28ccc4975 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -838,11 +838,9 @@ package android.app {
   public class BroadcastOptions {
     method public void clearRequireCompatChange();
     method public int getPendingIntentBackgroundActivityStartMode();
-    method @Deprecated public boolean isDeferUntilActive();
     method @Deprecated public boolean isPendingIntentBackgroundActivityLaunchAllowed();
     method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from=0) long);
     method @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) public void setBackgroundActivityStartsAllowed(boolean);
-    method @Deprecated @NonNull public android.app.BroadcastOptions setDeferUntilActive(boolean);
     method public void setDontSendToRestrictedApps(boolean);
     method @Deprecated public void setPendingIntentBackgroundActivityLaunchAllowed(boolean);
     method @NonNull public android.app.BroadcastOptions setPendingIntentBackgroundActivityStartMode(int);
diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java
index 481f671d3350d..a5095b2741fac 100644
--- a/core/java/android/app/BroadcastOptions.java
+++ b/core/java/android/app/BroadcastOptions.java
@@ -769,9 +769,7 @@ public class BroadcastOptions extends ComponentOptions {
     }
 
     /** {@hide} */
-    @SystemApi
     @Deprecated
-    // STOPSHIP: remove entirely after this API change lands in AOSP
     public @NonNull BroadcastOptions setDeferUntilActive(boolean shouldDefer) {
         if (shouldDefer) {
             setDeferralPolicy(DEFERRAL_POLICY_UNTIL_ACTIVE);
@@ -782,9 +780,7 @@ public class BroadcastOptions extends ComponentOptions {
     }
 
     /** {@hide} */
-    @SystemApi
     @Deprecated
-    // STOPSHIP: remove entirely after this API change lands in AOSP
     public boolean isDeferUntilActive() {
         return (mDeferralPolicy == DEFERRAL_POLICY_UNTIL_ACTIVE);
     }