[automerger skipped] Merge "Use customized event flag for data FMQ not_empty...

[automerger skipped] Merge "Use customized event flag for data FMQ not_empty to avoid conflict" into main am: 0bd9cd3b am: 991e5473 -s ours

am skip reason: Merged-In I0f5776edd58748195df61e4dae911df30f40e5b0 with SHA-1 e584b9d4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3080609



Change-Id: Idadf3195cea59672211fafbd6c7ac709d9668932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>