Merge "Allow wpa_supplicant to access KeyStore2"