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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8e427051adeb6e0beada35189192960c8ed1f82