Merge "Keystore 2.0: Tune Watchdog report frequency." am: 2bf0b18765 am: 976be643e5

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

Change-Id: I474d059b5df213aaf2e369c947762e1c84f108d2