Move ServiceWatcher into package

Allows for better OWNERS rights and decomposing ServiceWatcher into
multiple pieces.

Bug: 181665909
Test: builds
Change-Id: I63bad4140cf04fb227183bb53b61aeb8fa912f3f
6 files changed