diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index bb826deb4eff4..151a320494b46 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -35,6 +35,8 @@
             android:label="@string/permlab_testDenied"
             android:description="@string/permdesc_testDenied" />
 
+    <uses-permission android:name="com.android.frameworks.coretests.permission.TEST_GRANTED" />
+
     <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" />
     <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
     <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED" />
@@ -76,7 +78,6 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SMS"/>
-    <uses-permission android:name="android.permission.TEST_GRANTED" />
     <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
     <uses-permission android:name="com.google.android.googleapps.permission.ACCESS_GOOGLE_PASSWORD" />
     <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
@@ -1455,6 +1456,7 @@
             </intent-filter>
         </receiver>
         <receiver android:name="android.app.activity.RemoteGrantedReceiver"
+                android:process=":remoteReceiver"
                 android:permission="com.android.frameworks.coretests.permission.TEST_GRANTED"
                 android:exported="true">
             <intent-filter android:priority="2">
@@ -1462,6 +1464,7 @@
             </intent-filter>
         </receiver>
         <receiver android:name="android.app.activity.RemoteDeniedReceiver"
+                android:process=":remoteReceiver"
                 android:permission="com.android.frameworks.coretests.permission.TEST_DENIED"
                 android:exported="true">
             <intent-filter android:priority="2">
diff --git a/core/tests/coretests/src/android/app/activity/BroadcastTest.java b/core/tests/coretests/src/android/app/activity/BroadcastTest.java
index 0f81896692c00..d79c2fe19ce28 100644
--- a/core/tests/coretests/src/android/app/activity/BroadcastTest.java
+++ b/core/tests/coretests/src/android/app/activity/BroadcastTest.java
@@ -56,6 +56,8 @@ public class BroadcastTest extends ActivityTestsBase {
             "com.android.frameworks.coretests.activity.BROADCAST_MULTI";
     public static final String BROADCAST_ABORT =
             "com.android.frameworks.coretests.activity.BROADCAST_ABORT";
+    public static final String BROADCAST_RESULT =
+            "com.android.frameworks.coretests.activity.BROADCAST_RESULT";
 
     public static final String BROADCAST_STICKY1 =
             "com.android.frameworks.coretests.activity.BROADCAST_STICKY1";
@@ -106,7 +108,14 @@ public class BroadcastTest extends ActivityTestsBase {
     }
 
     public Intent makeBroadcastIntent(String action) {
+        return makeBroadcastIntent(action, false);
+    }
+
+    public Intent makeBroadcastIntent(String action, boolean makeImplicit) {
         Intent intent = new Intent(action, null);
+        if (makeImplicit) {
+            intent.addFlags(intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+        }
         intent.putExtra("caller", mCallTarget);
         return intent;
     }
@@ -277,7 +286,7 @@ public class BroadcastTest extends ActivityTestsBase {
             map.putString("foo", "you");
             map.putString("remove", "me");
             getContext().sendOrderedBroadcast(
-                    new Intent("com.android.frameworks.coretests.activity.BROADCAST_RESULT"),
+                    makeBroadcastIntent(BROADCAST_RESULT, true),
                     null, broadcastReceiver, null, 1, "foo", map);
             while (!broadcastReceiver.mHaveResult) {
                 try {
@@ -424,10 +433,13 @@ public class BroadcastTest extends ActivityTestsBase {
 
     public void testLocalReceivePermissionGranted() throws Exception {
         setExpectedReceivers(new String[]{RECEIVER_LOCAL});
-        getContext().sendBroadcast(makeBroadcastIntent(BROADCAST_LOCAL_GRANTED));
+        getContext().sendBroadcast(makeBroadcastIntent(BROADCAST_LOCAL_GRANTED, true));
         waitForResultOrThrow(BROADCAST_TIMEOUT);
     }
 
+    /*
+    // TODO: multi-package test b/c self-target broadcasts are always allowed
+    // even when gated on ungranted permissions
     public void testLocalReceivePermissionDenied() throws Exception {
         setExpectedReceivers(new String[]{RECEIVER_RESULTS});
 
@@ -438,16 +450,17 @@ public class BroadcastTest extends ActivityTestsBase {
         };
 
         getContext().sendOrderedBroadcast(
-                makeBroadcastIntent(BROADCAST_LOCAL_DENIED),
+                makeBroadcastIntent(BROADCAST_LOCAL_DENIED, true),
                 null, finish, null, Activity.RESULT_CANCELED,
                 null, null);
         waitForResultOrThrow(BROADCAST_TIMEOUT);
     }
+    */
 
     public void testLocalBroadcastPermissionGranted() throws Exception {
         setExpectedReceivers(new String[]{RECEIVER_LOCAL});
         getContext().sendBroadcast(
-                makeBroadcastIntent(BROADCAST_LOCAL),
+                makeBroadcastIntent(BROADCAST_LOCAL, true),
                 PERMISSION_GRANTED);
         waitForResultOrThrow(BROADCAST_TIMEOUT);
     }
@@ -462,7 +475,7 @@ public class BroadcastTest extends ActivityTestsBase {
         };
 
         getContext().sendOrderedBroadcast(
-                makeBroadcastIntent(BROADCAST_LOCAL),
+                makeBroadcastIntent(BROADCAST_LOCAL, true),
                 PERMISSION_DENIED, finish, null, Activity.RESULT_CANCELED,
                 null, null);
         waitForResultOrThrow(BROADCAST_TIMEOUT);
@@ -470,10 +483,13 @@ public class BroadcastTest extends ActivityTestsBase {
 
     public void testRemoteReceivePermissionGranted() throws Exception {
         setExpectedReceivers(new String[]{RECEIVER_REMOTE});
-        getContext().sendBroadcast(makeBroadcastIntent(BROADCAST_REMOTE_GRANTED));
+        getContext().sendBroadcast(makeBroadcastIntent(BROADCAST_REMOTE_GRANTED, true));
         waitForResultOrThrow(BROADCAST_TIMEOUT);
     }
 
+    /*
+    // TODO: multi-package test b/c self-target broadcasts are always allowed
+    // even when gated on ungranted permissions
     public void testRemoteReceivePermissionDenied() throws Exception {
         setExpectedReceivers(new String[]{RECEIVER_RESULTS});
 
@@ -484,16 +500,17 @@ public class BroadcastTest extends ActivityTestsBase {
         };
 
         getContext().sendOrderedBroadcast(
-                makeBroadcastIntent(BROADCAST_REMOTE_DENIED),
+                makeBroadcastIntent(BROADCAST_REMOTE_DENIED, true),
                 null, finish, null, Activity.RESULT_CANCELED,
                 null, null);
         waitForResultOrThrow(BROADCAST_TIMEOUT);
     }
+    */
 
     public void testRemoteBroadcastPermissionGranted() throws Exception {
         setExpectedReceivers(new String[]{RECEIVER_REMOTE});
         getContext().sendBroadcast(
-                makeBroadcastIntent(BROADCAST_REMOTE),
+                makeBroadcastIntent(BROADCAST_REMOTE, true),
                 PERMISSION_GRANTED);
         waitForResultOrThrow(BROADCAST_TIMEOUT);
     }
@@ -508,7 +525,7 @@ public class BroadcastTest extends ActivityTestsBase {
         };
 
         getContext().sendOrderedBroadcast(
-                makeBroadcastIntent(BROADCAST_REMOTE),
+                makeBroadcastIntent(BROADCAST_REMOTE, true),
                 PERMISSION_DENIED, finish, null, Activity.RESULT_CANCELED,
                 null, null);
         waitForResultOrThrow(BROADCAST_TIMEOUT);
@@ -516,13 +533,13 @@ public class BroadcastTest extends ActivityTestsBase {
 
     public void testReceiverCanNotRegister() throws Exception {
         setExpectedReceivers(new String[]{RECEIVER_LOCAL});
-        getContext().sendBroadcast(makeBroadcastIntent(BROADCAST_FAIL_REGISTER));
+        getContext().sendBroadcast(makeBroadcastIntent(BROADCAST_FAIL_REGISTER, true));
         waitForResultOrThrow(BROADCAST_TIMEOUT);
     }
 
     public void testReceiverCanNotBind() throws Exception {
         setExpectedReceivers(new String[]{RECEIVER_LOCAL});
-        getContext().sendBroadcast(makeBroadcastIntent(BROADCAST_FAIL_BIND));
+        getContext().sendBroadcast(makeBroadcastIntent(BROADCAST_FAIL_BIND, true));
         waitForResultOrThrow(BROADCAST_TIMEOUT);
     }
 
diff --git a/core/tests/coretests/src/android/app/activity/LaunchpadActivity.java b/core/tests/coretests/src/android/app/activity/LaunchpadActivity.java
index 766245600d13b..0b21fa90c1c4d 100644
--- a/core/tests/coretests/src/android/app/activity/LaunchpadActivity.java
+++ b/core/tests/coretests/src/android/app/activity/LaunchpadActivity.java
@@ -253,16 +253,16 @@ public class LaunchpadActivity extends Activity {
                 sendBroadcast(makeBroadcastIntent(BROADCAST_REGISTERED));
             } else if (BROADCAST_LOCAL.equals(action)) {
                 setExpectedReceivers(new String[]{RECEIVER_LOCAL});
-                sendBroadcast(makeBroadcastIntent(BROADCAST_LOCAL));
+                sendBroadcast(makeBroadcastIntent(BROADCAST_LOCAL, true));
             } else if (BROADCAST_REMOTE.equals(action)) {
                 setExpectedReceivers(new String[]{RECEIVER_REMOTE});
-                sendBroadcast(makeBroadcastIntent(BROADCAST_REMOTE));
+                sendBroadcast(makeBroadcastIntent(BROADCAST_REMOTE, true));
             } else if (BROADCAST_ALL.equals(action)) {
                 setExpectedReceivers(new String[]{
                         RECEIVER_REMOTE, RECEIVER_REG, RECEIVER_LOCAL});
                 registerMyReceiver(new IntentFilter(BROADCAST_ALL));
                 sCallingTest.addIntermediate("after-register");
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ALL), null);
+                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ALL, true), null);
             } else if (BROADCAST_MULTI.equals(action)) {
                 setExpectedReceivers(new String[]{
                         RECEIVER_REMOTE, RECEIVER_REG, RECEIVER_LOCAL,
@@ -277,23 +277,26 @@ public class LaunchpadActivity extends Activity {
                         RECEIVER_REMOTE, RECEIVER_LOCAL});
                 registerMyReceiver(new IntentFilter(BROADCAST_ALL));
                 sCallingTest.addIntermediate("after-register");
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ALL), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ALL), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ALL), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_LOCAL), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_REMOTE), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_LOCAL), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_REMOTE), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ALL), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ALL), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ALL), null);
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_REPEAT), null);
+                final Intent allIntent = makeBroadcastIntent(BROADCAST_ALL, true);
+                final Intent localIntent = makeBroadcastIntent(BROADCAST_LOCAL, true);
+                final Intent remoteIntent = makeBroadcastIntent(BROADCAST_REMOTE, true);
+                sendOrderedBroadcast(allIntent, null);
+                sendOrderedBroadcast(allIntent, null);
+                sendOrderedBroadcast(allIntent, null);
+                sendOrderedBroadcast(localIntent, null);
+                sendOrderedBroadcast(remoteIntent, null);
+                sendOrderedBroadcast(localIntent, null);
+                sendOrderedBroadcast(remoteIntent, null);
+                sendOrderedBroadcast(allIntent, null);
+                sendOrderedBroadcast(allIntent, null);
+                sendOrderedBroadcast(allIntent, null);
+                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_REPEAT, true), null);
             } else if (BROADCAST_ABORT.equals(action)) {
                 setExpectedReceivers(new String[]{
                         RECEIVER_REMOTE, RECEIVER_ABORT});
                 registerMyReceiver(new IntentFilter(BROADCAST_ABORT));
                 sCallingTest.addIntermediate("after-register");
-                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ABORT), null);
+                sendOrderedBroadcast(makeBroadcastIntent(BROADCAST_ABORT, true), null);
             } else if (BROADCAST_STICKY1.equals(action)) {
                 setExpectedReceivers(new String[]{RECEIVER_REG});
                 setExpectedData(new String[]{DATA_1});
@@ -436,7 +439,14 @@ public class LaunchpadActivity extends Activity {
     }
 
     private Intent makeBroadcastIntent(String action) {
+        return makeBroadcastIntent(action, false);
+    }
+
+    private Intent makeBroadcastIntent(String action, boolean makeImplicit) {
         Intent intent = new Intent(action, null);
+        if (makeImplicit) {
+            intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+        }
         intent.putExtra("caller", mCallTarget);
         return intent;
     }
diff --git a/core/tests/coretests/src/android/app/activity/LocalDeniedReceiver.java b/core/tests/coretests/src/android/app/activity/LocalDeniedReceiver.java
index 2120a1db463c0..16ea73f309376 100644
--- a/core/tests/coretests/src/android/app/activity/LocalDeniedReceiver.java
+++ b/core/tests/coretests/src/android/app/activity/LocalDeniedReceiver.java
@@ -23,7 +23,7 @@ import android.os.RemoteException;
 import android.os.IBinder;
 import android.os.Parcel;
 
-class LocalDeniedReceiver extends BroadcastReceiver {
+public class LocalDeniedReceiver extends BroadcastReceiver {
     public LocalDeniedReceiver() {
     }
 
diff --git a/core/tests/coretests/src/android/app/activity/RemoteDeniedReceiver.java b/core/tests/coretests/src/android/app/activity/RemoteDeniedReceiver.java
index 7c89346e820df..5c1ded93e1c34 100644
--- a/core/tests/coretests/src/android/app/activity/RemoteDeniedReceiver.java
+++ b/core/tests/coretests/src/android/app/activity/RemoteDeniedReceiver.java
@@ -23,7 +23,7 @@ import android.os.RemoteException;
 import android.os.IBinder;
 import android.os.Parcel;
 
-class RemoteDeniedReceiver extends BroadcastReceiver {
+public class RemoteDeniedReceiver extends BroadcastReceiver {
     public RemoteDeniedReceiver() {
     }
 
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 05f2fa096e4d0..1396654e37c83 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -237,6 +237,7 @@ import android.os.DropBoxManager;
 import android.os.FactoryTest;
 import android.os.FileUtils;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.IDeviceIdentifiersPolicyService;
 import android.os.IPermissionController;
@@ -2089,11 +2090,19 @@ public class ActivityManagerService extends IActivityManager.Stub
         mEnableOffloadQueue = SystemProperties.getBoolean(
                 "persist.device_config.activity_manager_native_boot.offload_queue_enabled", false);
 
-        mFgBroadcastQueue = new BroadcastQueue(this, mHandler,
+        // Decouple broadcast-related timing operations from other OS activity by
+        // using a dedicated thread.  Sharing this thread between queues is safe
+        // because we know the nature of the activity on it and can't stall
+        // unexpectedly.
+        HandlerThread broadcastThread = new HandlerThread("broadcast");
+        broadcastThread.start();
+        Handler broadcastHandler = broadcastThread.getThreadHandler();
+
+        mFgBroadcastQueue = new BroadcastQueue(this, broadcastHandler,
                 "foreground", foreConstants, false);
-        mBgBroadcastQueue = new BroadcastQueue(this, mHandler,
+        mBgBroadcastQueue = new BroadcastQueue(this, broadcastHandler,
                 "background", backConstants, true);
-        mOffloadBroadcastQueue = new BroadcastQueue(this, mHandler,
+        mOffloadBroadcastQueue = new BroadcastQueue(this, broadcastHandler,
                 "offload", offloadConstants, true);
         mBroadcastQueues[0] = mFgBroadcastQueue;
         mBroadcastQueues[1] = mBgBroadcastQueue;