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

Merge "Revert "Updated SBOM generator module to generate JSON spdx utility bill of"" am: 00670e0c am: 73536cb8

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



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