Merge "Revert "Generate SBOM of the target product in file sbom.spdx in...""...

Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21 am: edd91aa2

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



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