Merge "Add lmkd atoms to lmkd log_from_module" am: d40f090891 am: 374820d164

Change-Id: I841017ac4036b199bb9e427315905a2cf7a0d078