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 am: cf0cde94

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



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