Merge "Update OWNERS for ServiceWatcher" am: 7f2de331ac am: 170d46a5e5 am: 5f2d59fd2d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b46453e5be5e4d1d8e41b746393669abc118612