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 am: c56ee45c am: de086091

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



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