[automerger skipped] Merge "Add lmkd atoms to lmkd log_from_module" am: d40f090891 am: 374820d164 am: d1951777df -s ours
am skip reason: Change-Id I5e3ae2a0ec18c907901353f1d943500ce12a7a55 with SHA-1 79f068c1ae is in history

Change-Id: Idd8ba59387369d30ec4fe263b1731005f2a52e96