[DO NOT MERGE] Fix to correct the filter setting in order

Bug: 282106309
Test: on device
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I14b24770c35730cc681397e09cab11d589b825ce
1 file changed