Merge "Override a sendBroadcastUser() variant in BroadcastInterceptingContext." am: af61e0738c am: 33f61f4c18

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2321006

Change-Id: I45b31ba479c9c35fcc9227b8cad33d4b185c16c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/utils/testutils/java/com/android/internal/util/test/BroadcastInterceptingContext.java

@@ -245,6 +245,12 @@ public class BroadcastInterceptingContext extends ContextWrapper {
         sendBroadcast(intent);
     }
 
+    @Override
+    public void sendBroadcastAsUser(Intent intent, UserHandle user,
+            String receiverPermission, Bundle options) {
+        sendBroadcast(intent);
+    }
+
     @Override
     public void sendStickyBroadcast(Intent intent) {
         sendBroadcast(intent);