Merge "Update the SBOM integration test to include ramdisk partition and...

Merge "Update the SBOM integration test to include ramdisk partition and resolve some diffs." am: 0766f4c6 am: f10876f5 am: 7b572cef

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



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