Merge "Update $PRODUCT_OUT from the soong system image files" into main am:...

Merge "Update $PRODUCT_OUT from the soong system image files" into main am: 3507a28d am: 88a81fe2

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



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