Merge "Include watchdog timeout configuration in dumpsys output" into tm-dev...

Merge "Include watchdog timeout configuration in dumpsys output" into tm-dev am: 85d5a6eb am: 3320500d am: 6d55ce68

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310155



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