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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If55a943fad67c1fff22669473e5ea2279d0a1d7e