Merge "Accept KeyChain keys in WifiEnterpriseConfig." into sc-dev