Fix to correct the filter setting in order

Patched from ag/23208840

Bug: 282106309
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I5ed80f62d68ed5fb93fa6d182a4c2825cdb6b26d

nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java

@@ -254,14 +254,16 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
             ScanListenerRecord scanListenerRecord =
                     new ScanListenerRecord(scanRequest, listener, callerIdentity, deathRecipient);
 
+            mScanTypeScanListenerRecordMap.put(listenerBinder, scanListenerRecord);
             Boolean started = startProviders(scanRequest);
             if (started == null) {
+                mScanTypeScanListenerRecordMap.remove(listenerBinder);
                 return NearbyManager.ScanStatus.UNKNOWN;
             }
             if (!started) {
+                mScanTypeScanListenerRecordMap.remove(listenerBinder);
                 return NearbyManager.ScanStatus.ERROR;
             }
-            mScanTypeScanListenerRecordMap.put(listenerBinder, scanListenerRecord);
             NearbyMetrics.logScanStarted(scanListenerRecord.hashCode(), scanRequest);
             if (mScanMode < scanRequest.getScanMode()) {
                 mScanMode = scanRequest.getScanMode();