Merge cherrypicks of [15313376] into security-aosp-rvc-release

Change-Id: I6b9ae91409bcf0ce713efc8c03ba0d417f249cb1

Author: Android Build Coastguard Worker

core/java/android/hardware/display/DisplayManager.java

@@ -61,9 +61,6 @@ public final class DisplayManager {
      * {@link #EXTRA_WIFI_DISPLAY_STATUS} extra.
      * </p><p>
      * This broadcast is only sent to registered receivers and can only be sent by the system.
-     * </p><p>
-     * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission is required to
-     * receive this broadcast.
      * </p>
      * @hide
      */

services/core/java/com/android/server/display/WifiDisplayAdapter.java

@@ -91,10 +91,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
 
     private boolean mPendingStatusChangeBroadcast;
 
-    private static final String[] RECEIVER_PERMISSIONS_FOR_BROADCAST = {
-            android.Manifest.permission.ACCESS_FINE_LOCATION,
-    };
-
     // Called with SyncRoot lock held.
     public WifiDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,
             Context context, Handler handler, Listener listener,
@@ -436,8 +432,7 @@ private void handleSendStatusChangeBroadcast() {
         }
 
         // Send protected broadcast about wifi display status to registered receivers.
-        getContext().createContextAsUser(UserHandle.ALL, 0)
-                .sendBroadcastWithMultiplePermissions(intent, RECEIVER_PERMISSIONS_FOR_BROADCAST);
+        getContext().sendBroadcastAsUser(intent, UserHandle.ALL);
     }
 
     private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {