Merge "Keystore 2.0: Integrate onLockScreenEvent."