Merge "Fix keystore2 crash counting" am: 1600dc1a47

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2610327

Change-Id: I91918051c28f343689beca06a45dd7cb4ac46aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>