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

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

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