Merge "servicedispatcher: exit when adb debugging is turned off." am: 60969843c3 am: d158a08020

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

Change-Id: Ib2926ec033a9fc8315c08d57c35bcf5a10efc44a