Merge "Revert "Add a check that the staging directories don't..."" into main...

Merge "Revert "Add a check that the staging directories don't..."" into main am: 0968914e am: 61d7773a am: 6c4037c3 am: 3c646092

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



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