Merge "Revert "Clean staging dirs in build_image.py"" into main am: 44d86b13 am: e4a3296f

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



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