Fix potential deadlock in ServiceWatcher

Bug: 123363078
Test: manually
Change-Id: I9ac83c37c0c00170f95b505bdac68bb5db6e0283
3 files changed