Merge "logd: simplify Clear() + Prune() logic" am: 7a372d168a am: b4fc12cc6c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1329340

Change-Id: I6925a72bb87f51085dfd085c9ff0a88d5e98b180