Merge "Watchdog: Rename properties to follow guidelines" am: 62bdf8c076 am: cb24b18b50 am: 16f762211e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b23932117ca15b2dbe52da0234ebd54e9853bef