Merge "lmkd: Remove unnecessary conditional" am: 6b0e789a21
am: 27ee4c8d08

Change-Id: I30324613d863ef8b0d09b2f83b08c0a12b8fbbd2