[automerger skipped] Fix fmq_test am: 5ab31ae910 -s ours am: c5d0fe17bf -s ours am: f6851106e4 -s ours

am skip reason: Merged-In Iaf33d30b5601e838f8899e1dceb65c86a10566b0 with SHA-1 3f308c6acf is already in history

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

Change-Id: Ibfe5c941d5b79412bd0d427e3e23e35eaed7d5db
tree: 7014855978cb3bf656dfb1ea428fe8053e5c279a
  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