Merge "Fix WifiConfiguration#getAuthType"