Merge "Include watchdog timeout configuration in dumpsys output" into tm-dev am: 85d5a6eb1d am: 854c3ebb5c

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

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