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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c21124ca258bcfc6f968a25fa27f408d4213970