Merge "Revert^2 "Update HIDL EventFlagBits to have the correct values"" into main am: 68a0d78d58

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

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