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

Change-Id: Id83a13aa4ad09de0cd9b6f63d0135b0c25132503