Merge "Implement keystore2 logging of key creation events."