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

Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" am: f711149a am: a42c8822 am: 6eeaabaa am: 1cdff87b

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



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