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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22a2afd1d601b096f3dfa074d9f15303f6676f21