Merge "llkd: add live-lock daemon" am: 656bc24630
am: e40838d37a

Change-Id: I7998a53bfc73c36b9687af95c673266f613a5b86