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

Change-Id: Ib2438e0f6bfa7c6350eeb00dd1c7987f544dc2cc