Merge "Revert "Fully qualify android.net.wifi.ScanResult""