Merge "Split Keystore's onLockScreenEvent into onDevice{Unlocked,Locked}" into main am: a2609f539d

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

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