Merge "Cleanup WifiScanner client after failure" into udc-mainline-prod