diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index bc51774cef5ad..cebabcb204029 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -775,12 +775,14 @@ public class CompanionDeviceManagerService extends SystemService {
 
         exemptFromAutoRevoke(packageInfo.packageName, packageInfo.applicationInfo.uid);
 
-        if (mCurrentlyConnectedDevices.contains(association.getDeviceMacAddress())) {
-            grantDeviceProfile(association);
-        }
+        if (!association.isManagedByCompanionApp()) {
+            if (mCurrentlyConnectedDevices.contains(association.getDeviceMacAddress())) {
+                grantDeviceProfile(association);
+            }
 
-        if (association.isNotifyOnDeviceNearby()) {
-            restartBleScan();
+            if (association.isNotifyOnDeviceNearby()) {
+                restartBleScan();
+            }
         }
     }
 
@@ -1217,6 +1219,9 @@ public class CompanionDeviceManagerService extends SystemService {
         ArrayList<ScanFilter> result = new ArrayList<>();
         ArraySet<String> addressesSeen = new ArraySet<>();
         for (AssociationInfo association : getAllAssociations()) {
+            if (association.isManagedByCompanionApp()) {
+                continue;
+            }
             String address = association.getDeviceMacAddress();
             if (addressesSeen.contains(address)) {
                 continue;