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

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

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