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

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

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