Merge "Create new directory to move ServiceWatcher into" am: b0a8269167 am: 11e82fe9a8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I874e77fd67c9b9362659b4e71801792ce09bf5e3