Merge "Promote WifiConfiguration.configKey() to @SystemApi"