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

Change-Id: Ia9b2b7d77959a9981eeb3ad912ce330adde346f8