Merge "Rename getMaxNumScanSsids to getMaxSsidsPerScan in WifiNl80211Manager." into tm-dev