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

Change-Id: I8bc0ba5fd8c306b7bd25f70a873cb6691b5be87b