Merge "Improve watchdog logging" into main am: 7abcfd26bd

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

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