Merge "Add a check that the staging directories don't..." into main am: fe455d1c am: 39273188

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



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