[automerger skipped] Merge Android 12 am: abd3c31ed6 -s ours am: 30e7f5ef96 -s ours

am skip reason: Merged-In I2e483b7c619153b8b244b43fd61b8842cd262a47 with SHA-1 340b3045a6 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/libfmq/+/1847494

Change-Id: I2a163d79372132cbe6567f3c3f16900134c4c453
tree: b881890651c645b5ef3fde32a1ff9eb83684a7fe
  1. base/
  2. benchmarks/
  3. fuzzer/
  4. include/
  5. tests/
  6. Android.bp
  7. EventFlag.cpp
  8. FmqInternal.cpp
  9. OWNERS
  10. PREUPLOAD.cfg
  11. TEST_MAPPING