Merge "logd: whitelist should not preserve expire messages"