am 9e7df8e3: am 7aca9310: am 10a124d3: Merge "logd: whitelist should not preserve expire messages"

* commit '9e7df8e304081dbcae0e519527ab465c6ab3fee1':
  logd: whitelist should not preserve expire messages