Merge "Remove scanResultCache from WifiConfiguration" into m-wireless-dev