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

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

Change-Id: Idd7fed048d11b54d76dba27be2a396d8d09ad88d
Signed-off-by: Automerger Merge Worker <[email protected]>