Merge "Revert "Revert "Add system staging dir stamp file for bazel sand...""...

Merge "Revert "Revert "Add system staging dir stamp file for bazel sand..."" into main am: 8cad379e am: 3aad1523

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



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