Merge "logd: rework logic for LogTimeEntry" am: 6e52c23a3e
am: c2547d4a39

Change-Id: I89f1c220ae88e4fe2c1e6c201d507d44bbe4d10c