Merge "llkd: handle 'adbd shell setsid' to preserve adbd" am: 3009be5cb6
am: 8c49bd9158

Change-Id: I725cfd4b47940bfc31a492ff42a3f7d787ad35bc