Merge "logd: multiple identical do not report expired" am: f0cccf4565
am: 9627217f4c

Change-Id: If343ed69123a46f18b5d81b757e73db1d65606f3