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: fc3653e1

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



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