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

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

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