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

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



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