Merge "ANDROID: Avoid taking multiple locks in handle_lmk_event"