Merge "Fix a bug in the log directory cleanup logic." into main am: c5d2456d am: 1db55e4c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3248133



Change-Id: I07f18df21c4daa44804008e49df9ad36f2023722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>