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

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

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