Merge "Fix WifiConfiguration#getAuthType" into mainline-prod