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: afb2495f am: a27f3cef

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



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