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

Merge "Revert "Add system staging dir stamp file for bazel sandwich"" into main am: 068da3ef am: 713a5e79 am: 036d7839

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



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