Merge "servicedispatcher: pause until killed." am: 180f094883 am: 1152005db2 am: 059961c125 am: 138e706483

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

Change-Id: I98363614db7e2c64bdf9fbd7cad2062e10ce8484