WifiScanner: Partial revert of ag/12269583

Temporary fix that might break 60Ghz, will let jimmy debug that later.

Bug: 168277359
Test: Manually verified that we can see scan results on settings even
when the country code does not support DFS channels.
Test: atest android.net.wifi

Change-Id: I292324e8cfc0d90e7450b1dcb37cab55cd09328f