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

* commit '7aca9310aa4367674ddbf7413f1dc57c807e909a':
  logd: whitelist should not preserve expire messages