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