Merge "Revert "Update HIDL EventFlagBits to have the correct values"" into main