[automerger skipped] Merge "Enable lmkd kill tracing everywhere" am: e961bbcadc  -s ours am: 5d95ac61d7  -s ours
am: af1e0d7274  -s ours

Change-Id: I0396f78d5365b288b87f6a2df51df87c06adb9a4