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

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



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