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

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



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