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

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

Change-Id: Idf90747514f54b5298999fb73332cd47f1269dcc