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

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

Change-Id: I95b943c84b7e763fdad74f40da31b656313778a2