Merge "Depend on the staging dir files from soong-built image" into main am:...

Merge "Depend on the staging dir files from soong-built image" into main am: 35acdebc am: 11d88093

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



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