Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API."