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

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



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