[automerger skipped] Merge "Use customized event flag for data FMQ not_empty to avoid conflict" into main am: 94b3cbced9 am: da8149c5b1 -s ours

am skip reason: Merged-In Ie92f04091658e210dccb7a2d60ebbab14c49fb58 with SHA-1 3016dfbf01 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3080634

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