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

Change-Id: I6b34529353b03c8f23ed985da6f137fba5fca0c0