Fix up result type for bit-wise or of enum values

When combining enum values with bit-wise operators, the result is no
longer of the enum type, so we need to cast it back.

Test: local compile
Change-Id: I3697d37b612f0e29aabb46a6a958ca4ef0fed64f