Merge "Add KeystoreKeyEventReported atom for keystore logging."