Merge "servicedispatcher: pause until killed." am: 180f094883

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1734539

Change-Id: I2e8e253b9fa0afd21f4c405c2e31dd988bef6330