[automerger skipped] Merge Android 12 am: 5b0cfb22db -s ours

am skip reason: Merged-In Iaa926aa00e7d1a5a1604cf8c01c4bc66be05e678 with SHA-1 406599c6d8 is already in history

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

Change-Id: Ieed58e15a954ac883e0f70b27ea4f05912efac56
tree: 5680cd96b46de096460baf08f8f8da831a72d00b
  1. 30/
  2. S/