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

* commit '10a124d342530b4c366f08d3a899474c4e5eb7fc':
  logd: whitelist should not preserve expire messages