Ensure "matching" modes consider HDR types

Supported HDR types can differ betwen modes. Ensure that when comparing
modes for equality, supported HDR types is also checked.

Bug: 424150248
Test: atest DisplayServiceTests
Flag: com.android.graphics.surfaceflinger.flags.connected_display_hdr_v2
Change-Id: I0bb43f2249be2508318185d8a1cfb92d24b9156b