Merge "llkd: default enabled for userdebug"
am: 1803782064

Change-Id: I82cc7f038f56651db8900a57b0bf2898200c4c6e