[automerger skipped] Merge "Add KeystoreKeyEventReported atom for keystore...

[automerger skipped] Merge "Add KeystoreKeyEventReported atom for keystore logging." am: d64ab185 am: 7896d08f -s ours am: 67a96b1a -s ours am: d362bd0e -s ours am: ba8c9523 -s ours

am skip reason: Change-Id I66fbc2b8ed98a34f243387f8550b6523b13cb9a2 with SHA-1 7c336a66 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316774

Change-Id: I6d9b2374fc28158df2151d69d458e206d894d6e0