Merge "Add gaillard@ as the OWNER of Watchdog.java" into main am: c90568455f am: a6c13b07f9 am: 3fd81938b9

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

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