Enable common logic for proto 1 and proto 2

Check for either of the proto 1 or proto 2 flag to be enabled when
guarding logic that is common for both prototypes.

Bug: 260645044
Test: manual, build sysui, check desktop mode 1 works
Change-Id: Iba1d4f84032b1e059dcd100f64f20fec79e43113