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

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

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