Merge "Expose additional WifiScanner @SystemApis"