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

Change-Id: I852fa7aae9748d0fc6ef8093378c19e585c017b3