Merge "Add CDM API to filter by BSSID bitmask"