Merge "Keystore 2.0: Add watch dog library." am: 6c72732a9b

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1696267

Change-Id: I8cae1577e494f3c8ab2e674b534bceb70a687799