Clean up USER_OWNER in ServiceWatcher

Bug: 19913735
Change-Id: I1d9fe26efe7ec2abb6b164efb0af04416cc0f7fb
1 file changed