Merge "llkd: adbd is allowed to be a bad parent on userdebug"
am: eb9b11c096

Change-Id: I9cb0bc17b63bce95406dfb1c03054c71f681037b