[automerger skipped] Merge "Add KeystoreKeyEventReported atom for keystore logging." am: d64ab1853d am: 7896d08fec -s ours

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

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

Change-Id: I11640f1b6ce9e5cb7722152b73e039aa561e45e3