Merge "Add KeystoreKeyEventReported atom for keystore logging." am: d64ab1853d

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

Change-Id: I50b97bdd1ef26fbc43d3a45801846243211acb51