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 am: 24edccc7

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



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