Merge "Keystore 2.0: Add convenience API for watchdog module." am: 665e2cbf99 am: c133b64582

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

Change-Id: Ie5debd329ec3e9425027457b0e9d4c804eb9ee85