Merge changes from topic "am-5a6f444331ae472aaeb494acba3b9515" into udc-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 -s ours
  [automerger skipped] Some changes to support SBOM generation for b build unbundled APEXs. am: 233d5b97f8 -s ours