Merge "Use customized event flag for data FMQ not_empty to avoid conflict" into main am: 94b3cbced9

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

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