Merge "adbd: when rebooting, don't close socket before pausing." am: 9c16700e36 am: 2784b0a6bd
am: 4cb43de624

Change-Id: I20849bc5c872e1fa0369ef28aa715efc570a6265