Merge changes from topic \'aosp-merge-24-12\' am: 8b958921

am: 45ae4eb8  -s ours

* commit '45ae4eb8':
  Temporary workaround to build bouncycastle / nist-pkits
  Build: Build changes for multi oat/image support.
  Allow modules to override the default NOTICE file.
  Track introduction of libopenjdkjvm.
  Allow for 5200 words in dump-words-to-file
  Update the package whitelist for the boot image.
  Use core-oj alongside core-libart wherever required.