Merge "Add/use watchdog with standard timeout" into main am: de2ac5cf7d

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

Change-Id: I4e500d63f23e924bc7b08a835490bdd175a01387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>