Merge "libui: set USAGE_HW_2D in getValid10UsageBits"

        for (const auto bit : hardware::hidl_enum_iterator<BufferUsage>()) {

            bits = bits | bit;

        }

        // TODO(b/72323293): Remove this mask for EXTERNAL_DISP.

        bits = bits | (1 << 13);

        // TODO(b/72323293, b/72703005): Remove these additional bits

        bits = bits | (1 << 10) | (1 << 13);

        return bits;

    }();