Merge "Reapply "Add soong installed files to general-tests.zip"" into main am: 68452cdc

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



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