Merge "WifiServiceImpl:fix NPE in unregisterScanResultsCallback method when app send a null callbck." into main