Merge "Use longer watchdog deadline for RKP" into main am: 98ece8ff25

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

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