Merge "Update OWNERS for ServiceWatcher" am: 7f2de331ac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id77ff7ba9a71c27ab4469f1cd7b57e3038b680c6