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 am: 69e65d43 am: aea84178

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



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