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 am: 6f57b6d3

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



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