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

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



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