Merge "healthd: logd: add timestamp to kernel logged battery messages"