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

am skip reason: Merged-In Ife37bccc1772b793e935f93d806526c20aa46d93 with SHA-1 9a07d83266 is already in history

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

Change-Id: Icb1b502a14ecc94e0216881db3e5bc9003713cb8
tree: 2989a5ca8d84f90442eab9a1aa02f3710278ec51
  1. 29/
  2. 30/
  3. S/
  4. OWNERS