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

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

Change-Id: Iefe47627fec9555ef4abccbdc89465f7dc61925f