Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" am: f711149a

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



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