Merge "servicedispatcher: exit when adb debugging is turned off."