Merge "Updated SBOM generator module to generate JSON spdx utility bill of...

Merge "Updated SBOM generator module to generate JSON spdx utility bill of material" am: 09df4c65 am: 63734a59

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



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