Merge "Allow wpa_supplicant fetch certs from KeyStore2"