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 am: 29669208 am: ae01393f

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



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