Merge "Directly call 'ctl.restart' on adbd if adb is enabled"