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

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

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



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