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

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

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