Merge "Add new diffs found in vendor partition in sbom_test." into main am:...

Merge "Add new diffs found in vendor partition in sbom_test." into main am: 66ae90d3 am: 035726c1

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



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