[automerger skipped] Merge 24Q4 into AOSP main am: 0054f8de56 -s ours

am skip reason: Merged-In Iad62846066769e2c7021200b71fd29cc83e77338 with SHA-1 7f49cbb07e is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/abi-dumps/platform/+/3411925

Change-Id: Ic941be81590a64443a50c365cfa6341a8af72dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 915c97e8e55477bd55990b9cf632a45510a66ac3
  1. 33/
  2. 34/
  3. 35/
  4. BUILD.bazel