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

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

Change-Id: Iee86d71b2ceeabd4caed0d44a561ca7cc711d83b