Merge "Implement keystore2 logging of key operation events."