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

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

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